From: ThibG <thib@sitedethib.com>
Date: Sat, 25 Jan 2020 19:31:22 +0000 (+0100)
Subject: Merge pull request #1268 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3591621edc4cc3658199527b0847e997ad1ce0a4;p=mastodon.git

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

Merge upstream changes
---

3591621edc4cc3658199527b0847e997ad1ce0a4