Paula Quispe 04c681a41c Merged in develop (pull request #5799) ...

Update branch

Approved-by: Paula Quispe <paula.quispe@processmaker.com>

2017-07-18 13:07:46 +00:00

..

BusinessModel

Merged in develop (pull request #5799)

2017-07-18 13:07:46 +00:00

Core

restore method beforeMergeData

2017-03-30 13:50:38 -04:00

Exception

Adding adapters for Workflow->Bpmn and Bpmn->Workflow projects, and more updates & fixes

2014-02-05 17:29:28 -04:00

Exporter

HOR-1777

2016-09-05 14:25:28 -04:00

Importer

HOR-2410

2017-04-20 15:10:52 -04:00

Policies

HOR-1750

2017-05-08 15:22:46 -04:00

Project

HOR-2410

2017-04-20 15:10:52 -04:00

Services

Merged in develop (pull request #5762)

2017-06-27 16:09:17 +00:00

Util

resolv conflict

2017-05-25 13:38:22 -04:00