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

..

calendarEdit.html

…

calendarEdit.js

…

email.tpl

…

emails.js

IMPROVEMENET in emails configuration form

2014-01-09 14:07:42 -04:00

maintenance.html

Updates for OAuth2 support

2013-10-22 11:17:48 -04:00

pmLogo.html

…

pmLogo.js

…

system.js

…

uxUsersList.js

…