Erik Amaru Ortiz 0f234df1db Merge branch 'master' of github.com:colosa/processmaker ...

Conflicts:
	workflow/engine/classes/model/Process.php

2014-01-23 21:26:44 -04:00

..

bin

BUG 13938 Line error_reporting(E_ALL) in cron.php and cron_single.php is generating unnecesary errors SOLVED

2014-01-21 13:02:08 -04:00

classes

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

2014-01-23 21:26:44 -04:00

config

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

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

content

…

controllers

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

2014-01-23 21:26:44 -04:00

data

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

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

includes

…

js

…

lib

…

menus

…

methods

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

2014-01-23 21:26:44 -04:00

plugins

…

skinEngine

…

src

Merged in darojas/processmaker (pull request #109)

2014-01-23 17:45:30 -04:00

templates

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

2014-01-23 21:26:44 -04:00

test

…

xmlform

BUG-13892 IMPROVEMENT.

2014-01-17 12:56:40 -04:00

gulliver-win.bat

…

PmBootstrap.php

…