Oana Nechiforescu 1ba70727ae Merge branch 'release/V2.5' of https://gitlab.alfresco.com/records-management/records-management into merge/upgradeTestDataFrom25 ...

# Conflicts:
#	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java

2016-12-22 15:29:10 +02:00

..

module/org_alfresco_module_rm

Merge branch 'release/V2.5' of https://gitlab.alfresco.com/records-management/records-management into merge/upgradeTestDataFrom25

2016-12-22 15:29:10 +02:00

repo

Merge release/V2.4 into release/V2.5.

2016-10-28 13:31:20 +01:00

rm/rest/api

RM-4528 - extract original exception so it can be properly mapped to api error code

2016-12-10 14:01:16 +02:00

util

Let git handle line endings for us.

2016-09-23 14:36:49 +01:00

workflow

Let git handle line endings for us.

2016-09-23 14:36:49 +01:00