George Kalampokis 77d50773b8 Merge branch 'improved_queries' into Development ... # Conflicts: # dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java		2021-10-07 11:05:19 +03:00
..
src	Merge branch 'improved_queries' into Development	2021-10-07 11:05:19 +03:00
pom.xml	Fix various library issues with postgres and elastic	2021-06-25 12:32:58 +03:00