Merge branch 'master' of github.com:University-of-Potsdam-MM/rooms

University-of-Potsdam-MM · Jan 17, 2016 · 37c2b0a · 37c2b0a
2 parents 9674290 + 230a8a2
commit 37c2b0a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/config.json b/config.json
@@ -22,6 +22,6 @@
     "force_page": null,
     "ads_update_frequency": 60,
     "ads": [
-        "one.html"
+        "two.html"
     ]
 }
diff --git a/split.html b/split.html
@@ -118,4 +118,4 @@
 <script src="./static/js/main.js"></script>
 
 </body>
-</html>
+</html>
diff --git a/two.html b/two.html
@@ -0,0 +1,4 @@
+<strong class="page-headline"><span class="js_ads_headline">Werbung</span></strong>
+	<div class="js_body">
+		<video src="http://streamup.uni-potsdam.de/flash/83040532_hi.mp4" autoplay="autoplay"></video>
+</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,4 +118,4 @@ @@
     <script src="./static/js/main.js"></script>
     </body>
-    </html>
+    </html>