From: ThibG <thib@sitedethib.com>
Date: Wed, 24 Jun 2020 15:06:26 +0000 (+0200)
Subject: Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d;p=mastodon.git

Merge pull request #1361 from ThibG/glitch-soc/merge-upstream

Merge upstream changes
---

8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d