From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 7 May 2021 17:51:00 +0000 (+0200)
Subject: Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=50f8ee2e07e0a8a0ab8971543cb6544c8d6c5f5d;p=mastodon.git

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

Merge upstream changes
---

50f8ee2e07e0a8a0ab8971543cb6544c8d6c5f5d