ikalyvas 5ae18beb5d Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java		2019-03-05 17:46:18 +02:00
..
main	Merge branch 'ui-refactoring' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into ui-refactoring	2019-03-05 17:46:18 +02:00
test/resources	no message	2018-06-05 11:17:14 +03:00