DESKTOP-4ES9U2E\aldom 16c124cc3d Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetIdRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DistributionRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/HostRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/KeywordRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/LicenseRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/SecurityAndPrivacyRDAMapper.java # dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/TechnicalResourceRDAMapper.java		2021-12-30 11:28:15 +02:00
..
data	Add a placeholder field in multiplicity. (BackEnd)	2021-12-15 16:26:06 +02:00
rda	Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development	2021-12-30 11:28:15 +02:00
validators	Renames "Project" to "Grant on backend. (Issue #145)	2019-07-31 17:57:34 +03:00
DataModel.java	no message	2018-03-21 12:16:32 +02:00
HintedModelFactory.java	Replaced System.out.println, System.err.println and printStackTrace with a logger (ref #223)	2020-01-16 17:46:24 +02:00