From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 19 Jul 2021 10:09:41 +0000 (+0200)
Subject: Merge pull request #1569 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a2df067f9852f0db3140dd2c35539f4e74bdb6dc;p=mastodon.git

Merge pull request #1569 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
---

a2df067f9852f0db3140dd2c35539f4e74bdb6dc