From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 25 Jun 2021 10:20:46 +0000 (+0200)
Subject: Merge pull request #1557 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ff3626269eae9c2d15af4c7f05427c2bfcb065ef;p=mastodon.git

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

Merge upstream changes
---

ff3626269eae9c2d15af4c7f05427c2bfcb065ef