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
..
main	Merge branch 'ui-redesign' into Development	2020-10-06 16:43:20 +03:00
test/resources	no message	2018-06-05 11:17:14 +03:00