Merge branch 'master' of https://git.fachschaften.org/tudo-cs-infoscreen

6e36b718 · Tilman Vatteroth · 4c86ff7a · 5cc66853 · 6e36b718 · 6e36b718
Commit 6e36b718 authored 6 years ago by Tilman Vatteroth
--- a/panels/werbung/style.less
+++ b/panels/werbung/style.less
--- a/panels/werbung/template.html
+++ b/panels/werbung/template.html
--- a/test
+++ b/test
--- a/tmp/.gitignore
+++ b/tmp/.gitignore
--- a/tmp/dummy.txt
+++ b/tmp/dummy.txt