Efstratios Giannopoulos ce8ff28955 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDao.java # dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDaoImpl.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DepositManager.java		2023-10-18 19:03:35 +03:00
..
src	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2023-10-18 19:03:35 +03:00
pom.xml	Fix compilation errors and fix swagger ui description formatting	2023-10-13 09:50:22 +03:00