Merge branch 'master' into dev

c1cc85a9 · Tilman Vatteroth · 8190549b · 1bb6bf7b · c1cc85a9 · 8190549b
Commit c1cc85a9 authored 8 years ago by Tilman Vatteroth
--- a/config/layouts/default.json
+++ b/config/layouts/default.json
@@ -17,29 +17,6 @@
 			"type": "cycler",
 			"duration": 5,
 			"panels": [
-				{
-					"type": "panel",
-					"name": "werbung",
-					"config": {
-						"files": [
-							{
-							"filename": "itour2016_0.png",
-							"enddate": "02.11.2016"
-							},
-							{
-							"filename": "DAT_2016_Flyer_DINA6.png",
-							"enddate": "18.11.2016"
-							},
-							{
-							"filename": "Ankndigung_FVV.png",
-							"enddate": "30.11.2016"
-							},
-							{
-							"filename": "OpenSourceInfoscreen.jpg"
-							}
-						]
-					}
-				},
 				{
 					"type": "panel",
 					"name": "ufc"

--- a/panels/werbung/img/Ankndigung_FVV.png
+++ b/panels/werbung/img/Ankndigung_FVV.png
--- a/panels/werbung/img/DAT_2016_Flyer_DINA6.png
+++ b/panels/werbung/img/DAT_2016_Flyer_DINA6.png
--- a/panels/werbung/img/itour2016_0.png
+++ b/panels/werbung/img/itour2016_0.png