Files
DSpace/dspace/config/spring/api
Raf Ponsaerts 248e67f9a3 Merge remote-tracking branch 'dspace/master' into w2p-64428_scripts-prototype-importing-and-exporting
Conflicts:
	dspace-api/src/main/java/org/dspace/app/launcher/ScriptLauncher.java
	dspace-server-webapp/src/main/java/org/dspace/app/rest/ScriptProcessesController.java
	dspace-server-webapp/src/main/java/org/dspace/app/rest/scripts/handler/impl/RestDSpaceRunnableHandler.java
	dspace-server-webapp/src/test/java/org/dspace/app/scripts/handler/impl/TestDSpaceRunnableHandler.java
2020-01-06 14:11:55 +01:00
..