inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a2c5c11de4260655f049fbac4d726f1d9318cdf0
alfresco-community-repo/rm-community/rm-community-repo/source/java/org/alfresco
History
Roxana Lucanu-Ghetu a2c5c11de4 Merge branch 'origin/feature/RM-3347_checkExclusiveClearanceHierarchicalMarks' into master 
# Conflicts:
#	rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/query/rm-query-context.xml
#	rm-enterprise/rm-enterprise-repo/src/main/java/org/alfresco/module/org_alfresco_module_rm/query/EnterpriseRecordsManagementQueryDAOImpl.java
2016-11-18 15:15:45 +02:00
..
module/org_alfresco_module_rm
Merge branch 'origin/feature/RM-3347_checkExclusiveClearanceHierarchicalMarks' into master
2016-11-18 15:15:45 +02:00
repo
Merge release/V2.4 into release/V2.5.
2016-10-28 13:31:20 +01:00
rm/rest/api
RM-4357 - return null when allowableOperations is empty
2016-11-17 14:50:17 +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