From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 16 Jun 2021 10:42:40 +0000 (+0200)
Subject: Merge pull request #1550 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a434f370f38ac66e05000545e36d7c696f4962d0;p=mastodon.git

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

Merge upstream changes
---

a434f370f38ac66e05000545e36d7c696f4962d0