Efstratios Giannopoulos a68ddd42ce Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-backend/core/src/main/java/eu/eudat/authorization/Permission.java		2023-10-24 18:01:38 +03:00
..
java/eu/eudat	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2023-10-24 18:01:38 +03:00