Andrea Adamczyk 8b5ef84fa7 Solving conflicts for PMC-1126

2019-09-04 12:31:37 -04:00

..

bin/tasks

PMC-1018

2019-07-31 16:32:36 -04:00

classes

PMC-1073 Solve the issue in the Circle CI related to LightTest

2019-08-23 11:51:51 -04:00

controllers

Solving conflicts for PMC-1126

2019-09-04 12:31:37 -04:00

methods/users

PMC-1019

2019-08-01 14:40:43 -04:00

src/ProcessMaker

Merged in bugfix/PMC-1107 (pull request #7038)

2019-08-27 13:39:19 +00:00