Rodrigo Quelca 5011ba6b76 fix merge conflicts

2020-12-18 19:28:38 +00:00

..

admin.php

…

appFolder.php

…

backApp.php

…

cancel.php

…

caseOptions.php

…

cases.php

…

caseTracker.php

…

home.php

PMCORE-2500

2020-12-07 22:42:37 +00:00

process.php

…

processes.php

…

processmaker.php

…

rbac.appEdit.php

…

rbac.application.php

…

rbac.appView.php

…

rbac.authentication.php

…

rbac.authSource.php

…

rbac.permission.php

…

rbac.php

…

rbac.role.php

…

rbac.user.php

…

rbac.userEdit.php

…

rbac.userView.php

…

setup.php

PMCORE-2352 User extended attributes PMCORE-2247

2020-12-16 19:47:59 -04:00

simplified.php

…

tools.php

…

toolsTranslations.php

…

users.php

…

wf.login.php

…