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
b7311e28ac570dd92bde1fc9144310598863f25c
alfresco-community-repo/rm-community/rm-community-repo/source/java/org/alfresco/repo
History
Tuna Aksoy b7311e28ac Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25 
Conflicts:
	rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/rm-action-context.xml
	rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DestroyAction.java
2016-10-05 15:20:19 +01:00
..
action
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
imap
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
jscript
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
model/filefolder
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
rule
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
security
Let git handle line endings for us.
2016-09-23 10:34:36 +01:00
web/scripts
Merge branch 'release/V2.4' into merge-2.5/MergeV24ToV25
2016-10-05 15:20:19 +01:00