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

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

Merge upstream changes
---

70909c5b094523b0cf77123a2566310b2f148e24