jennylee 103daf3650 Merge branch 'master' of bitbucket.org:jennydmz/processmaker ...

Conflicts:
	workflow/engine/js/stagesmap/core/stagesmap.js
	workflow/engine/xmlform/tracker/tracker_Configuration.xml

2014-06-05 09:55:43 -04:00

..

engine

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

2014-06-05 09:55:43 -04:00

public_html

updateing app.php to remove composer autoload use, and some little tweaks

2014-05-28 12:08:00 -04:00