Merge branch 'master' into stable

diff --cc 2021/sponsors/index.html
index cd934b2253a8e02b9f124cc033b294d4bfc37ed9,ac14daae07fd2d141417ba1da3289f22327e3cdd..5c05facb7c3ca4d3a6fe85546448fd019ab254d7
--- 1/2021/sponsors/index.html
--- 2/2021/sponsors/index.html
+++ b/2021/sponsors/index.html
@@@ -111,13 -111,9 +111,17 @@@
  
  <p>To inquire about sponsoring the event, or if you have any questions, please email <a href="mailto:campaigns@fsf.org">campaigns@fsf.org.</a></p>
  
++<<<<<<< HEAD
 +<!--<p><a href="Sponsoring2020.pdf"><img src="https://static.fsf.org/nosvn/libreplanet/2020/assets/Sponsoring2020.jpg" width="40%" align="right" hspace="20" vspace="20"></a></p>-->
++=======
+ <p><a href="Sponsoring2021.pdf"><img src="https://static.fsf.org/nosvn/libreplanet/2021/assets/Sponsoring2021.jpg" width="40%" align="right" hspace="20" vspace="20"></a></p>
++>>>>>>> master
  
 -<!-- <h1>LibrePlanet 2021 Exhibitors</h1> -->
 +</br>
 +
 +<h1>LibrePlanet 2021 Exhibitors</h1> 
 +
 +Information for 2021 exhibitors will follow soon. 
  
  <!-- <p>The lively Exhibit Hall at LibrePlanet will be open from 9:00 - 18:00 on both conference days, with something for everyone. Be sure to take a stroll around and meet exhibitors who care about software freedom.</p> -->