Commit Graph

6 Commits

Author SHA1 Message Date
Diamantis Tziotzios 22582676a3 Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot
# Conflicts:
#	dmp-backend/src/test/resources/applicationContextTEST.xml
2018-07-23 18:56:09 +03:00
Ioannis Kalyvas 92ddb33eb8 no message 2018-06-27 18:37:26 +03:00
Ioannis Kalyvas 4fade0d9b0 no message 2018-02-09 17:54:41 +02:00
Diamantis Tziotzios ad4af5aa1f cleanup 2017-12-19 19:34:00 +02:00
Diamantis Tziotzios bf6247a091 no message 2017-12-18 13:24:12 +02:00
Diamantis Tziotzios 8ff927a4a7 no message 2017-12-18 12:01:22 +02:00