From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 27 Aug 2021 13:28:00 +0000 (+0200)
Subject: Merge pull request #1591 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e7e04b46d750f5e2addfd9650991727101d76910;p=mastodon.git

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

Merge upstream changes
---

e7e04b46d750f5e2addfd9650991727101d76910