Ronald Q 2435ecfaf6 Merge remote-tracking branch 'pm/3.1' into HOR-1544

2016-07-29 14:57:16 -04:00

..

bin

HOR-779

2016-07-22 13:26:11 -04:00

classes

Merged in paulis/processmaker/HOR-1472 (pull request #4611)

2016-07-28 18:28:25 -04:00

config

Merged in qronald/processmaker/HOR-1511 (pull request #4621)

2016-07-28 16:00:45 -04:00

content

…

controllers

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -04:00

data

Merged in qronald/processmaker/HOR-1511 (pull request #4621)

2016-07-28 16:00:45 -04:00

includes

…

js

HOR-1473

2016-07-22 17:35:39 -04:00

lib

…

menus

…

methods

Merged in luisfernandosl/processmaker/HOR-1469-A-31 (pull request #4641)

2016-07-29 14:46:15 -04:00

plugins

…

skinEngine

…

src

Merge remote-tracking branch 'pm/3.1' into HOR-1544

2016-07-29 14:57:16 -04:00

templates

Merged in paulis/processmaker/HOR-1473 (pull request #4612)

2016-07-29 11:39:18 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…