Julio Cesar Laura Avendaño 954ea53d72 Merged in mcuiza/processmaker/HOR-308 (pull request #3751) ...

HOR-308

2016-02-29 18:06:25 -04:00

..

bin

Merged in herbertsg/processmaker/PM-4514 (pull request #3411)

2015-12-18 19:44:24 -04:00

classes

Merged in mcuiza/processmaker/HOR-308 (pull request #3751)

2016-02-29 18:06:25 -04:00

config

Merged in dheeyi/processmaker/HOR-299 (pull request #3754)

2016-02-29 16:36:31 -04:00

content

…

controllers

Merged in paulis/processmaker/HOR-290 (pull request #3748)

2016-02-29 11:36:07 -04:00

data

Merged in dheeyi/processmaker/HOR-299 (pull request #3754)

2016-02-29 16:36:31 -04:00

includes

…

js

…

lib

…

menus

HOR-7

2016-01-25 11:33:17 -04:00

methods

HOR-254: Need the list of groups that cause the 'merge' option when importing.

2016-02-29 12:58:32 -04:00

plugins

…

skinEngine

HOR-202

2016-02-12 10:39:40 -04:00

src

Merged in mcuiza/processmaker/HOR-254 (pull request #3747)

2016-02-29 18:05:13 -04:00

templates

HOR-254: Need the list of groups that cause the 'merge' option when importing.

2016-02-29 12:58:32 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…