amentis 63a8820681 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html		2023-11-29 15:32:03 +02:00
..
src/main/java/eu/eudat	Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring	2023-11-29 15:32:03 +02:00
pom.xml	user changes	2023-11-20 17:09:24 +02:00