Efstratios Giannopoulos fef2df6014 Merge branch 'reference-type-refactor' of code-repo.d4science.org:MaDgiK-CITE/argos into reference-type-refactor ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ReferenceController.java		2024-02-12 17:44:46 +02:00
..
java/eu/eudat	Merge branch 'reference-type-refactor' of code-repo.d4science.org:MaDgiK-CITE/argos into reference-type-refactor	2024-02-12 17:44:46 +02:00
resources	reference-type-refactor	2024-02-08 18:12:47 +02:00