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

Browse Source

Conflicts:
	workflow/engine/classes/class.plugin.php
	workflow/engine/classes/class.pluginRegistry.php

...

This commit is contained in:

Erik Amaru Ortiz

2013-12-03 18:23:12 -04:00

parent 5710710673 3d59823b79

commit 2398200adf

118 changed files with 22708 additions and 5200 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

5010

workflow/engine/data/mysql/insert.sql

File diff suppressed because it is too large Load Diff