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
..
cookies-policy	splash screen changes	2020-06-25 17:52:00 +03:00
privacy	dmp advanced editor changed to remain at the same page when saving	2019-12-11 16:51:03 +02:00
terms	splash screen changes	2020-06-25 17:52:00 +03:00
sidebar-footer.component.css	Redesign of landing page, sign in interface, sidebar, navbar, dashboard (still in progress)	2020-06-26 12:08:51 +03:00
sidebar-footer.component.html	Redesign of landing page, sign in interface, sidebar, navbar, dashboard (still in progress)	2020-06-26 12:08:51 +03:00
sidebar-footer.component.ts	Redesign of landing page, sign in interface, sidebar, navbar, dashboard (still in progress)	2020-06-26 12:08:51 +03:00