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

..

create-db.sql

…

insert.sql

BUG-13604 Day and Month are not translated

2013-12-18 10:22:36 -04:00

schema.sql

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

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

sqldb.map

…