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

diff --cc 2022/fun/index.html
index 67f0b62ddba56f791a578bbfff9c1014439fb494,494a510015bfe9777b20bdf9743036b5f12c2913..651667123c1ca9e2ab1321babe46e11326efc09b
--- 1/2022/fun/index.html
--- 2/2022/fun/index.html
+++ b/2022/fun/index.html
@@@ -101,12 -101,7 +101,15 @@@ Craig Topham (FSF copyright and licensi
  
  <ul>
  <li><strong>Time:</strong> 18:30 - 19:30 EDT (22:30 UTC), Saturday 3/19</li>
- <li>LP22 Lounge B<a href="https://greenlight.fsf.org/dav-e3z-h6e">https://greenlight.fsf.org/dav-e3z-h6e></a></li>
 +<li><strong>Location:</strong>
 +<ul><li>LP22 Lounge A <a href="https://greenlight.fsf.org/dav-6vv-mcf">https://greenlight.fsf.org/dav-6vv-mcf></a></li>
- <li>LP22 Game B <a href="https://greenlight.fsf.org/dav-rnv-29a">https://greenlight.fsf.org/dav-rnv-29a></a></li>
++<!--<li>LP22 Lounge B<a href="https://greenlight.fsf.org/dav-e3z-h6e">https://greenlight.fsf.org/dav-e3z-h6e></a></li>
 +<li>LP22 Game A (Minetest) <a href="https://greenlight.fsf.org/dav-mm6-prx">https://greenlight.fsf.org/dav-mm6-prx></a></li>
++<li>LP22 Game B <a href="https://greenlight.fsf.org/dav-rnv-29a">https://greenlight.fsf.org/dav-rnv-29a></a></li>-->
 +
++=======
+ <li><strong>Location:</strong><a href="https://greenlight.fsf.org/dav-6vv-mcf">https://greenlight.fsf.org/dav-6vv-mcf</a></li>
++>>>>>>> 6c2d7f5dd767dec3b001d4f07b48454f57785f96
  <li><strong>Registration:</strong> <p>To participate in the afterparty, you will need to be <a href="https://my.fsf.org/civicrm/event/info?reset=1&id=99">registered at the "Supporter" or "Stalwart"level</a>.</p>
  </li>
  </ul>