From: ThibG <thib@sitedethib.com>
Date: Sat, 11 May 2019 10:35:25 +0000 (+0200)
Subject: Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=fe00f7a7e4469d18b43be2159fa9d953d2050f46;p=mastodon.git

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

Merge upstream changes
---

fe00f7a7e4469d18b43be2159fa9d953d2050f46