From: ThibG <thib@sitedethib.com>
Date: Tue, 30 Jun 2020 22:18:49 +0000 (+0200)
Subject: Merge pull request #1366 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=814d3f343f8caae3366410900eec0b90b9bbbb7b;p=mastodon.git

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

Merge upstream changes
---

814d3f343f8caae3366410900eec0b90b9bbbb7b