NESS\P3700299 1cd2880c3c Merge branch 'DeleteFavoriteFullTests' ...

# Conflicts:
#	src/main/java/org/alfresco/rest/model/RestErrorModel.java

2017-01-11 12:53:55 +02:00

..

java/org/alfresco/rest

Merge branch 'DeleteFavoriteFullTests'

2017-01-11 12:53:55 +02:00

resources

update log4j to include threads

2017-01-10 17:40:10 +02:00