Dante 710297dfc4 Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 ...

Conflicts:
	workflow/engine/templates/strategicDashboard/formDashboard.js

2015-04-27 16:20:52 -04:00

..

engine

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

2015-04-27 16:20:52 -04:00

public_html

Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2

2015-04-22 13:31:18 -04:00