Efstratios Giannopoulos bdcaee004d Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-backend/core/src/main/java/eu/eudat/audit/AuditableAction.java # dmp-backend/web/src/main/resources/config/permissions.yml		2023-10-27 18:52:34 +03:00
..
src/main/java/eu/eudat	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2023-10-27 18:52:34 +03:00
pom.xml	Partially fix Deposit Logic and add support for upcomming micro-services	2023-10-18 18:15:52 +03:00