Merge branch 'dev'

+ FVV vorbei

Merge branch 'dev'
27185f29 · Tilman Vatteroth · 2fb2b78f · 1fae3b1a · 2fb2b78f · 27185f29
Commit 27185f29 authored 9 years ago by Tilman Vatteroth
--- a/panels/werbung/img/FVVSoSe16_21.png
+++ b/panels/werbung/img/FVVSoSe16_21.png
--- a/panels/werbung/script.js
+++ b/panels/werbung/script.js
 var lastWerbung=0;
-var werbung_img = ["reality1.png", "reality2.png", "FVVSoSe16_21.png"];
+var werbung_img = ["reality1.png", "reality2.png"];
 var werbung_img_display = null;
 this.loaded=function(panel,config) {
 	werbung_display= $(panel).find("#werbung_display");