Merge branch 'MLAB-56' into 'master'

Mlab 56 See merge request !2

Merge branch 'MLAB-56' into 'master'
Mlab 56 See merge request !2
62880f10 · Wolfgang Knopki · 393920ba · 0ac2db14 · 62880f10 · 62880f10
Commit 62880f10 authored 4 years ago by Wolfgang Knopki
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 881 additions and 165 deletions
+881 -165
--- a/views/DE/project/project-simplified.pug
+++ b/views/DE/project/project-simplified.pug
--- a/views/DE/project/project.html
+++ b/views/DE/project/project.html
--- a/views/DE/project/projectOverview.pug
+++ b/views/DE/project/projectOverview.pug
--- a/views/DE/project/projects.pug
+++ b/views/DE/project/projects.pug
--- a/views/DE/project/videoconferences.pug
+++ b/views/DE/project/videoconferences.pug
--- a/views/404.pug
+++ b/views/404.pug
--- a/views/500.pug
+++ b/views/500.pug
--- a/views/forgotPwd.pug
+++ b/views/forgotPwd.pug
--- a/views/EN/account/home.pug
+++ b/views/EN/account/home.pug
--- a/views/profile.pug
+++ b/views/profile.pug
--- a/views/registration.pug
+++ b/views/registration.pug
--- a/views/reset.pug
+++ b/views/reset.pug
--- a/views/security.pug
+++ b/views/security.pug
--- a/views/services.pug
+++ b/views/services.pug
--- a/views/error.pug
+++ b/views/error.pug
--- a/public/views_TBD/layout.jade
+++ b/public/views_TBD/layout.jade
--- a/views/EN/project/addProjectOverview.pug
+++ b/views/EN/project/addProjectOverview.pug
--- a/views/EN/project/mailinglists.pug
+++ b/views/EN/project/mailinglists.pug
--- a/views/EN/project/projects.pug
+++ b/views/EN/project/projects.pug
--- a/views/TBD/profile-old.html
+++ b/views/TBD/profile-old.html