George Kalampokis a3af8ce3a5 Merge branch 'spring-update' into Development ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java # dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java # dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java		2021-10-08 16:04:52 +03:00
..
src	Merge branch 'spring-update' into Development	2021-10-08 16:04:52 +03:00
pom.xml	Update Spring boot framework to version 2.5.2	2021-09-07 09:42:31 +03:00