From: zoe1 <zoe@fsf.org>
Date: Mon, 1 Mar 2021 16:03:43 +0000 (+0100)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dd1636b45a4a63b3bb7c73d478847094cdb051d6;p=libreplanet-static.git

Merge branch 'master' into stable
---

dd1636b45a4a63b3bb7c73d478847094cdb051d6
diff --cc 2021/sponsors/index.html
index cd934b22,ac14daae..5c05facb
--- a/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> -->