Diamantis Tziotzios e65bce0f5a Merge branch 'ui-redesign' into Development ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java # dmp-backend/web/src/main/java/eu/eudat/models/data/external/ResearchersExternalSourcesModel.java # dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml		2020-10-06 16:43:20 +03:00
..
java/eu/eudat	Merge branch 'ui-redesign' into Development	2020-10-06 16:43:20 +03:00
resources	Merge branch 'ui-redesign' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-redesign	2020-10-05 16:27:43 +03:00