Julio Cesar Laura Avendaño bb935e1637 Solving conflicts updating with last changes in develop branch

2020-12-03 20:19:49 +00:00

..

bin/tasks

PMCORE-1151

2020-04-03 15:16:18 -04:00

classes

fixes phpunit crashes

2020-10-26 20:52:11 +00:00

controllers

PMCORE-1782 Cannot import a PMTABLE.

2020-07-14 13:46:17 -04:00

methods

PMCORE-561

2020-09-18 16:04:05 -04:00

src/ProcessMaker

Solving conflicts updating with last changes in develop branch

2020-12-03 20:19:49 +00:00