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

diff --combined 2020/fun/index.html
index 5527c3225da5d29e2212296fee66e86858e1b7fc,21c2fb6409744587777274f0a584f562e935475d..786b88d02e9b63be47d2af1df35e1dea12466c81
--- 1/2020/fun/index.html
--- 2/2020/fun/index.html
+++ b/2020/fun/index.html
@@@ -1,6 -1,6 +1,6 @@@
  <!--#include virtual="/2020/includes/header.html"-->
  
- <p><title>LibrePlanet 2020 &mdash; Events </title></p>
+ <title>LibrePlanet 2020 &mdash; Events </title>
  
  <!--#include virtual="/2020/includes/banner.html"-->
  <!--#include virtual="/2020/includes/sidebar.html"-->
@@@ -25,7 -25,8 +25,7 @@@
  <h3>Organize your own social event!</h3>
  <p>If you are looking to organize your own dinner or meetup, you can do so using <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2020">the LibrePlanet wiki</a> 2020 conference social and dinner pages as a central place for communication about this. </p>
  
 -<!--#include virtual="/2020/includes/footer.html"-->
 -<!--#include virtual="/2020/includes/common_js.html"-->
 -<!--#include virtual="/2020/includes/safe_space_js.html"-->
 -<!--#include virtual="/2020/includes/ahp_js.html"-->
 -<!--#include virtual="/2020/includes/close.html" -->
 +      <!--#include virtual="/2020/includes/footer.html"-->
 +      <!--#include virtual="/2020/includes/common_js.html"-->
 +      <!--#include virtual="/2020/includes/fun_js.html"-->
 +      <!--#include virtual="/2020/includes/close.html"-->