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
..
helpers	no message	2018-06-27 13:29:21 +03:00
pdf	Refactor PDF conversion	2021-10-12 18:17:16 +03:00
types	Add support for Html text when exporting to docx (alpha)	2021-10-05 17:58:46 +03:00
word	madmp changes	2021-12-29 15:24:46 +02:00
xml	Add a placeholder field in multiplicity. (BackEnd)	2021-12-15 16:26:06 +02:00