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

diff --cc 2020/includes/home-content.html
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391,3d8da4884df923e90c8afca497ab8af0030fe84a..37c82b8d37324919d8cc8038883f9dbf2029b52e
--- 1/2020/includes/home-content.html
--- 2/2020/includes/home-content.html
+++ b/2020/includes/home-content.html
@@@ -1,0 -1,2 +1,3 @@@
 -<p>LibrePlanet 2020's theme is "<strong>Free the Future</strong>.” </p>
+ <p>LibrePlanet is an annual conference hosted by the <a href="https://www.fsf.org&quot;&gt;Free Software Foundation">Free Software Foundation</a> for free software enthusiasts and anyone who cares about the intersection of technology and social justice.  LibrePlanet brings together software developers, law and policy experts, activists, students, and computer users to learn skills, celebrate free software accomplishments, and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2020 will feature programming for all ages and experience levels.</p>
++<p>LibrePlanet 2020's theme is "<strong>Free the Future</strong>.” </p>
++