Efstratios Giannopoulos 48352f0461 Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-frontend/src/app/core/common/enum/app-role.ts # dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts # dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.html # dmp-frontend/src/app/ui/admin/user/listing/role-editor/user-role-editor.component.scss # dmp-frontend/src/assets/i18n/en.json		2024-04-16 11:12:49 +03:00
..
src/main/java/eu/eudat	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2024-04-16 11:12:49 +03:00
pom.xml	update common models	2024-04-10 13:36:21 +03:00