From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 8 Apr 2022 21:07:00 +0000 (+0200)
Subject: Merge pull request #1738 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9309c53d21df806d57dd59dbc59a807d2f8b8b11;p=mastodon.git

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

Merge upstream changes
---

9309c53d21df806d57dd59dbc59a807d2f8b8b11