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

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

Merge upstream changes
---

3d05ebfdc3524cff9f01b760176e175e73b55875