Erik Amaru Ortiz 428da67762 Merge branch 'master' of github.com:colosa/processmaker ...

Conflicts:
	workflow/public_html/sysGeneric.php

2014-01-15 11:14:59 -04:00

..

databases.php

…

environments.php

…

paths.php

…

propel.ini

…

propel.mssql.ini

…

propel.mysql.ini

…

propel.oracle.ini

…

propel.pgsql.ini

…

properties.ini

…

rbac.ini

…

rest-config.ini.dist

BUG 5765 I add the triggers t process SOLVED

2012-10-16 00:29:52 -04:00

schema.xml

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

2014-01-15 11:14:59 -04:00