Paula Quispe 2a850ede19 conflicts: merge develop

2021-12-02 11:58:33 -04:00

..

adhocUserProxy.php

PMCORE-2892

2021-03-22 09:52:45 -04:00

admin.php

…

adminProxy.php

PMCORE-3377 An alert notice is displayed before creating a table

2021-09-29 13:03:04 -04:00

appProxy.php

PMCORE-3555

2021-11-26 15:42:26 -04:00

caseSchedulerProxy.php

…

DashboardModule.php

…

designer.php

Merged in bugfix/PMCORE-1335 (pull request #7332)

2020-09-18 18:24:25 +00:00

fakeApi.php

…

FileLogs.php

…

home.php

…

InstallerModule.php

PMCORE-3582

2021-12-01 18:23:51 +00:00

main.php

…

newSiteProxy.php

PMCORE-3393

2021-10-12 14:20:51 -04:00

pmGmail.php

…

pmTables.php

PMCORE-3377 An alert notice is displayed before creating a table

2021-09-29 13:03:04 -04:00

pmTablesProxy.php

PMCORE-2358

2021-06-29 13:51:25 +00:00

processOptionsProxy.php

…

processProxy.php

PMCORE-1176

2020-10-30 18:21:13 +00:00

strategicDashboard.php

…

webEntryProxy.php

…