From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 12 Feb 2021 13:02:24 +0000 (+0100)
Subject: Merge pull request #1500 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8792128f38e19b0d7882468a4f1f9362b98793a0;p=mastodon.git

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

Merge upstream changes
---

8792128f38e19b0d7882468a4f1f9362b98793a0