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
..
config	Merge branch 'Development' of https://code-repo.d4science.org/MaDgiK-CITE/argos into Development	2021-12-30 11:28:15 +02:00
css	Adds logout option on smaller screen account menu	2020-11-09 11:34:24 +02:00
i18n	1. Change configuration of Zenodo to production.	2021-12-22 15:59:58 +02:00
images	pt user guide update	2021-08-16 18:36:10 +03:00
localization	Add ExtraProperties for DMP and language for Dataset Template	2020-06-03 12:13:31 +03:00
resources	Bug fixes and language updates.	2021-04-27 23:33:30 +03:00
scss	upgrade to Angular 12	2021-09-24 21:52:14 +03:00
splash	about how it works text updates	2021-08-30 20:57:21 +03:00
.gitkeep	Initial import of DMP project modules.	2017-09-14 13:43:44 +03:00