From: Claire <claire.github-309c@sitedethib.com>
Date: Sat, 22 May 2021 13:16:21 +0000 (+0200)
Subject: Merge pull request #1542 from ClearlyClaire/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2024aef0f9b52297d814811f5825678a563f78ff;p=mastodon.git

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

Merge upstream changes
---

2024aef0f9b52297d814811f5825678a563f78ff