Merge branch 'testing' into 'MLAB-201'
# Conflicts: # videoconference.html
Showing
+165 -245
css/Login-Form-Clean.css
0 → 100644
img/Anmelden.png
0 → 100644
+ 0
- 0
41.4 KB
img/M4_LAB_LOGO.jpg
0 → 100644
+ 0
- 0
137 KB
img/M4_LAB_LOGO.png
0 → 100644
+ 0
- 0
87.9 KB
js/generalFunction.js
0 → 100644
js/headfootLogout.js
deleted
100644 → 0
js/registration.js
0 → 100644
js/security.js
0 → 100644