Merge branch 'master' of vcs.fsf.org:libreplanet-static

diff --git a/2018/assets/js/stream.js b/2018/assets/js/stream.js
index 399e3464e0848c44c56b8668abb6ceb9852ffdfc..e891dbe8b3218691e75ffdbd8cbd58ce21e68850 100644 (file)
--- a/2018/assets/js/stream.js
+++ b/2018/assets/js/stream.js
@@ -147,11 +147,11 @@ app.streams = [
     speakerSmallMount: "/stream-155-480p.webm",
     ircChannel: "#libreplanet_room155"
   }, {
-    name: "Room 101",
+    name: "Room 463",
     speakerMount: "/stream-101.webm",
     desktopMount: "/slides-101.webm",
     speakerSmallMount: "/stream-101-480p.webm",
-    ircChannel: "#libreplanet_room101"
+    ircChannel: "#libreplanet_room463"
   }
 ];
 
@@ -297,7 +297,6 @@ app.view = function(ctrl) {
     renderSpeakerStream(),
     showDesktop ? renderDesktopStream() : null,
     renderToggleDesktopStream(),
-    m("p", [ m("a", { href: app.icecastUrl + stream.speakerSmallMount }, "Low res stream" ) ] ),
     m("h2", "IRC"),
     m("p", "Join the discussion online!"),
     m("ul", [