Merge branch 'intermediate' into 'prepare_production'

Intermediate See merge request !52

Merge branch 'intermediate' into 'prepare_production'
Intermediate See merge request !52
2f7d51cb · Wolfgang Knopki · f658a0f8 · afedb536 · f658a0f8 · f658a0f8
Commit 2f7d51cb authored 4 years ago by Wolfgang Knopki
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 33 additions and 1354 deletions
+33 -1354
--- a/js/bootstrap.min.js
+++ b/js/bootstrap.min.js
--- a/js/carousel.js
+++ b/js/carousel.js
--- a/js/headfoot.js
+++ b/js/headfoot.js
--- a/videoconference.html
+++ b/videoconference.html