From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 29 Sep 2021 22:29:38 +0000 (+0200)
Subject: Merge pull request #1612 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5e36c3b44c052afb1aa61e2405c595c726bc9503;p=mastodon.git

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

Merge upstream changes
---

5e36c3b44c052afb1aa61e2405c595c726bc9503