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
..
main	Merge branch 'improved_queries' into Development	2021-10-07 11:05:19 +03:00
test/resources	no message	2018-06-05 11:17:14 +03:00