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
..
dmp-overview.component.html	dmp overview re-design -- not completed: lock, remove, versions	2020-07-02 18:29:33 +03:00
dmp-overview.component.scss	Merge branch 'Development' into ui-redesign	2020-07-03 11:21:46 +03:00
dmp-overview.component.ts	dmp overview re-design -- not completed: lock, remove, versions	2020-07-02 18:29:33 +03:00
dmp-overview.module.ts	dmp advanced editor changed to remain at the same page when saving	2019-12-11 16:51:03 +02:00