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

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

Merge upstream changes
---

65b003cab86b6837012f4562d3d9d0910f3e942e