Julio Cesar Laura Avendaño 7dffbf54cb Merged in luisfernandosl/processmaker/PM-1628 (pull request #1724) ...

PM-1728 "ProcessMaker-MA: Users(endpoints POST-PUT)" SOLVED

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

..

bin

…

classes

Merged in paulis/processmaker/PM-VERACODE-10 (pull request #1721)

2015-03-23 11:24:31 -04:00

config

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

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

content

…

controllers

…

data

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

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

includes

…

js

…

lib

…

menus

…

methods

Merged in dheeyi/processmaker/PM-1809 (pull request #1718)

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

plugins

…

skinEngine

…

src

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

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

templates

Merged in dheeyi/processmaker/PM-1882 (pull request #1747)

2015-03-23 20:21:49 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…