From: ThibG <thib@sitedethib.com>
Date: Sun, 19 May 2019 20:07:42 +0000 (+0200)
Subject: Merge pull request #1055 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0998e3ade8b03174c0a69ba4f78b31f92ccc1ade;p=mastodon.git

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

Merge upstream changes
---

0998e3ade8b03174c0a69ba4f78b31f92ccc1ade