From: ThibG <thib@sitedethib.com>
Date: Sat, 30 Nov 2019 17:13:53 +0000 (+0100)
Subject: Merge pull request #1249 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7f6315841c98a1eee6cb57171a91a88f5c5343df;p=mastodon.git

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

Merge upstream changes
---

7f6315841c98a1eee6cb57171a91a88f5c5343df