Merge remote branch 'upstream/master'

Browse Source

...

This commit is contained in:

jennylee

2012-10-19 16:54:43 -04:00

parent 74082729f2 da702ce462

commit 669370c080

26 changed files with 8611 additions and 9859 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

7564

workflow/engine/classes/class.processes.php

File diff suppressed because it is too large Load Diff

922

workflow/engine/classes/model/CalendarDefinition.php

File diff suppressed because it is too large Load Diff

874

workflow/engine/classes/model/Content.php

File diff suppressed because it is too large Load Diff

458

workflow/engine/classes/model/ReportTable.php

File diff suppressed because it is too large Load Diff

427

workflow/engine/classes/model/Route.php

File diff suppressed because it is too large Load Diff

393

workflow/engine/classes/model/Stage.php

File diff suppressed because it is too large Load Diff

459

workflow/engine/classes/model/StepSupervisor.php

File diff suppressed because it is too large Load Diff

910

workflow/engine/classes/model/Translation.php

File diff suppressed because it is too large Load Diff

929

workflow/engine/classes/triggers/class.pmSugarFunctions.php

File diff suppressed because it is too large Load Diff