Tuna Aksoy b8aa5b6d90 Merge branch 'release/V2.5' into merge/Merge_RM-4997 ...

Conflicts:
	rm-automation/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
	rm-automation/src/test/java/org/alfresco/test/community/level2/filePlan/DestroyRecordFolderActions.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java

2017-04-10 22:59:27 +01:00

..

module/org_alfresco_module_rm

Merge branch 'release/V2.5' into merge/Merge_RM-4997

2017-04-10 22:59:27 +01:00

repo

RM-4308 Merge release/V2.5 into master.

2017-02-24 16:04:02 +00:00

rm/rest/api

RM-4619 - moved the fileplan component check back

2017-01-30 17:03:41 +02:00

util

RM-4942 Ensure the API sorting is case insensitive.

2017-03-23 14:22:19 +00:00

workflow

Update year to 2017 on license headers.

2017-02-21 14:23:31 +00:00