Merge branch 'stable' into irc-live

diff --cc 2021/includes/live_sidebar.html
index 4ad97aba51d706a42b22395799c23af9e8bfb2c4,bc0857ec5cda908774097a898eb0f39c0a479878..3cf99c521ec19fe3d574a51919042a765566bec6
--- 1/2021/includes/live_sidebar.html
--- 2/2021/includes/live_sidebar.html
+++ b/2021/includes/live_sidebar.html
@@@ -46,8 -47,24 +46,23 @@@
  /join #libreplanet_room_hallway</pre>
    </div>
  </div>
 --->
  <!-- end irc links bar -->
  
+ <!-- start low res links bar -->
+ <div class="panel panel-default">
+   <div class="panel-heading">
+       <h3 class="panel-title">Low Resolution Streams</h3>
+   </div>
+   <div class="panel-body">
+       <p>
+       <a href="https://live.fsf.org/stream-room-jupiter-lowres.webm">Jupiter</a> (480p)</br>
+       <a href="https://live.fsf.org/stream-room-saturn-lowres.webm">Saturn</a> (480p)</br>
+       <a href="https://live.fsf.org/stream-room-neptune-lowres.webm">Neptune</a> (480p)</br>
+       </p>
+   </div>
+ </div>
+ <!-- end low res links bar -->
+ 
  <!-- start LP20 signup -->
  <div class="panel panel-default">
    <div class="panel-heading">

diff --cc 2021/live/index.html
index 9b5fa566b377737aee93954e0a77fb522c033457,3a1f002dc99ac746c723c93e5bbad76ef94d576e..dd8611fc8ae9c251511097f921c67058800f158f
--- 1/2021/live/index.html
--- 2/2021/live/index.html
+++ b/2021/live/index.html
@@@ -51,7 -59,13 +59,11 @@@ ffplay https://live.fsf.org/stream-room
      <iframe src="https://irc.libreplanet.org/irc/"
              class="irc-client">
      </iframe>
 -    -->
  
+     <div style="margin-top: 20px">
+         <p>For low resolution stream URLs, check the sidebar to the right.</p>
+     </div>
+ 
    </div> <!-- end of main content -->
  
    <div class="col-sm-4"> <!-- start of right sidebar column -->

diff --cc 2021/registered/chill/index.html
Simple merge

diff --cc 2021/registered/index.html
Simple merge