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

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

Merge upstream changes
---

db5baf3d1a93cbf6961f721205cff0beaf71bffd