Efstratios Giannopoulos c27e98acd8 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/persist/descriptionproperties/PropertyDefinitionFieldSetPersist.java		2024-04-25 10:27:06 +03:00
..
src	add Description template hasMultiplicity	2024-04-24 14:07:51 +03:00
pom.xml	revert that also	2024-04-08 12:23:19 +03:00
pom.xml.rej	brand change	2024-04-24 17:12:09 +03:00