Ioannis Kalyvas 50444a0b73 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot ... # Conflicts: # dmp-backend/src/main/java/eu/eudat/helpers/Transformers.java # dmp-frontend/src/index.html		2018-03-06 17:02:13 +02:00
..
main	Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot	2018-03-06 17:02:13 +02:00
test/resources	Merge branch 'Development'	2018-01-18 12:45:51 +02:00