From: ThibG <thib@sitedethib.com>
Date: Sun, 12 Apr 2020 15:58:25 +0000 (+0200)
Subject: Merge pull request #1316 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=615073df33b9a4317ac5c93fdef83c9cd34567fa;p=mastodon.git

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

Merge upstream changes
---

615073df33b9a4317ac5c93fdef83c9cd34567fa