Diamantis Tziotzios 7a8375b988 Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf' ... # Conflicts: # dmp-backend/elastic/src/main/java/eu/eudat/elastic/criteria/DatasetCriteria.java # dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dataset.java # dmp-backend/elastic/src/main/java/eu/eudat/elastic/entities/Dmp.java # dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DatasetRepository.java # dmp-backend/elastic/src/main/java/eu/eudat/elastic/repository/DmpRepository.java # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java # dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java # dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java # dmp-backend/web/src/main/java/eu/eudat/models/data/listingmodels/DataManagementPlanListingModel.java		2021-12-09 12:18:39 +02:00
..
main	Merge commit '2cb985c23c4ceda99efc78bcc8e77b3eceeb0bcf'	2021-12-09 12:18:39 +02:00
test/resources	no message	2018-06-05 11:17:14 +03:00