Efstratios Giannopoulos 055d29b95f Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-backend/web/pom.xml # dmp-backend/web/src/main/resources/config/application.yml		2023-10-12 12:04:26 +03:00
..
main	Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring	2023-10-12 12:04:26 +03:00
test/resources	no message	2018-06-05 11:17:14 +03:00