From: ThibG <thib@sitedethib.com>
Date: Fri, 28 Jun 2019 17:11:06 +0000 (+0200)
Subject: Merge pull request #1145 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f7c0e326ab11a597b17a22dd8889f0690d7ffd73;p=mastodon.git

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

Merge upstream changes
---

f7c0e326ab11a597b17a22dd8889f0690d7ffd73