From: ThibG <thib@sitedethib.com>
Date: Mon, 6 Apr 2020 19:44:34 +0000 (+0200)
Subject: Merge pull request #1312 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c47be5bd864a1f5244f35122ba7fae31a149c73d;p=mastodon.git

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

Merge upstream changes
---

c47be5bd864a1f5244f35122ba7fae31a149c73d