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

..

images

BUG 11603 "Please consider include 'special' pages..." SOLVED

2013-06-18 22:14:40 +00:00

skins

Add new skin neoclassic

2013-05-10 16:40:22 -04:00

bootstrap.php

…

sysGeneric.php

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

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

sysUnnamed.php

…

Web.config

…