Julio Cesar Laura Avendaño 057bdbe356 Merged in paulis/processmaker/HOR-1451 (pull request #4572) ...

HOR-1451

2016-07-22 12:34:45 -04:00

..

bin

conflict

2016-07-22 10:59:13 -04:00

classes

Merged in paulis/processmaker/HOR-1451 (pull request #4572)

2016-07-22 12:34:45 -04:00

config

Solving conflicts with branch 3.1-CONTENT

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

content

Updating .po file for sprint HOR-13

2016-07-12 08:52:54 -04:00

controllers

Solving conflicts with branch 3.1-CONTENT

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

data

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

includes

…

js

…

lib

…

menus

…

methods

Merged in julceslau/processmaker/3.1 (pull request #4605)

2016-07-21 18:36:45 -04:00

plugins

…

skinEngine

…

src

Merged in dheeyi/processmaker/HOR-1442 (pull request #4586)

2016-07-22 11:08:41 -04:00

templates

HOR-788

2016-07-21 12:44:23 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…