From: ThibG <thib@sitedethib.com>
Date: Mon, 27 May 2019 19:26:03 +0000 (+0200)
Subject: Merge pull request #1072 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1b0ce85e3da4b5c1941f65da7d73258da6eed6d0;p=mastodon.git

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

Merge upstream changes
---

1b0ce85e3da4b5c1941f65da7d73258da6eed6d0