Erik Amaru Ortiz 2398200adf Merge branch 'master' of github.com:colosa/processmaker ...

Conflicts:
	workflow/engine/classes/class.plugin.php
	workflow/engine/classes/class.pluginRegistry.php

2013-12-03 18:23:12 -04:00

..

engine

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

2013-12-03 18:23:12 -04:00

public_html

Removing libraries from Michelangelo

2013-11-27 16:22:17 -04:00