Files
DSpace/dspace/config/spring/api
Raf Ponsaerts 17d1b20086 Merge remote-tracking branch 'dspace/master' into w2p-69349_edit-community-assign-roles
Conflicts:
	dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java
	dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityRestRepository.java
	dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java
	dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/CollectionMatcher.java
	dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/CommunityMatcher.java
2020-03-31 11:57:04 +02:00
..
2019-09-27 10:09:43 +02:00