Diamantis Tziotzios 1615707418 Merge branch 'Development' into ui-redesign ... # Conflicts: # dmp-frontend/src/app/app-routing.module.ts # dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.scss # dmp-frontend/src/app/ui/navbar/navbar.component.html # dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.html # dmp-frontend/src/assets/i18n/en.json # dmp-frontend/src/assets/i18n/es.json # dmp-frontend/src/assets/i18n/gr.json		2020-07-03 11:21:46 +03:00
..
data	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
rda	Fixed minor issues with RDA Mapping	2020-06-25 13:30:47 +03:00
validators	Renames "Project" to "Grant on backend. (Issue #145)	2019-07-31 17:57:34 +03:00
DataModel.java	no message	2018-03-21 12:16:32 +02:00
HintedModelFactory.java	Replaced System.out.println, System.err.println and printStackTrace with a logger (ref #223)	2020-01-16 17:46:24 +02:00