Merge branch 'master' into 'Mlab-366'
# Conflicts: # js/headfoot.js
Showing
+7 -13
css/bootstrap_TBD.css
100644 → 100755
File mode changed from 100644 to 100755
img/M4_LAB_LOGO_SHIB_GROSS.jpg
0 → 100644
+ 0
- 0
13 KB
img/M4_LAB_LOGO_SHIB_KLEIN.ico
0 → 100644
+ 0
- 0
1.12 KB
img/Wissensaustausch.jpg
deleted
100644 → 0
+ 0
- 0
223 KB