Julio Cesar Laura Avendaño 4710fae568 Merged in victorsl/processmaker/PM-1635 (pull request #1752) ...

PM-1635 "PM-1635 y PM-1154" SOLVED

2015-03-23 20:54:17 -04:00

..

bin

…

classes

Merged in mcuiza/processmaker/PM-1859 (pull request #1750)

2015-03-23 20:48:08 -04:00

config

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

content

…

controllers

PM-1918

2015-03-23 18:44:23 -04:00

data

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

includes

…

js

PM-1856

2015-03-23 20:23:08 -04:00

lib

…

menus

…

methods

Merged in victorsl/processmaker/PM-1635 (pull request #1752)

2015-03-23 20:54:17 -04:00

plugins

…

skinEngine

…

src

Merged in luisfernandosl/processmaker/PM-1628 (pull request #1724)

2015-03-23 20:23:31 -04:00

templates

PM-1635 "PM-1635 y PM-1154" SOLVED

2015-03-23 20:34:18 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…