jennylee f6788b35d5 Resolving conflicts

2015-03-26 18:14:51 -04:00

..

admin.php

…

appFolder.php

…

backApp.php

…

cancel.php

…

caseOptions.php

…

cases.php

Envio temporal

2015-03-16 17:48:09 -04:00

caseTracker.php

…

process.php

…

processes.php

…

processmaker.php

Resolving conflicts

2015-03-26 18:14:51 -04:00

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

Resolving conflicts

2015-03-26 18:14:51 -04:00

simplified.php

BUG 9943 Advanced Search menu should be seen on UXS SOLVED

2012-11-09 09:10:59 -04:00

tools.php

…

toolsTranslations.php

…

users.php

…

wf.login.php

…