Efstratios Giannopoulos e81e6dd89a Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-backend/core/src/main/java/eu/eudat/model/builder/DmpBuilder.java		2023-11-07 17:08:44 +02:00
..
src/main/java/eu/eudat	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2023-11-07 17:08:44 +02:00
pom.xml	DescriptionTemplate refactor	2023-11-01 18:12:59 +02:00