text conflict erased
authorzoe1 <zoe@fsf.org>
Mon, 1 Mar 2021 16:06:54 +0000 (17:06 +0100)
committerzoe1 <zoe@fsf.org>
Mon, 1 Mar 2021 16:06:54 +0000 (17:06 +0100)
commit222985a52aa31cb1ccdc4c973f8eb54ebd95ab91
tree44f274cbd32010ea2830967332668acaae248573
parentdd1636b45a4a63b3bb7c73d478847094cdb051d6
text conflict erased
2021/sponsors/index.html