Victor Saisa Lopez 2a56afe09a Merge branch 'master' of bitbucket.org:colosa/processmaker ...

Conflicts:
	workflow/engine/src/Services/api.ini

2013-12-16 10:07:02 -04:00

..

bin

…

classes

Merge branch 'master' of github.com:colosa/processmaker

2013-12-11 19:04:25 -04:00

config

litle changes for /project endpoint

2013-12-08 23:30:20 -04:00

content

…

controllers

Merge branch 'master' of github.com:colosa/processmaker

2013-12-11 19:04:25 -04:00

data

litle changes for /project endpoint

2013-12-08 23:30:20 -04:00

includes

…

js

…

lib

…

menus

…

methods

Merge branch 'master' of github.com:colosa/processmaker

2013-12-11 19:04:25 -04:00

plugins

…

skinEngine

…

src

Merge branch 'master' of bitbucket.org:colosa/processmaker

2013-12-16 10:07:02 -04:00

templates

Merge branch 'master' of github.com:colosa/processmaker

2013-12-11 19:04:25 -04:00

test

…

xmlform

…

gulliver-win.bat

…

PmBootstrap.php

…