From: ThibG <thib@sitedethib.com>
Date: Mon, 11 Mar 2019 12:23:54 +0000 (+0100)
Subject: Merge pull request #953 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=45e4c90a23ccd6ccbed389d5c1b62f830d2c3757;p=mastodon.git

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

Merge upstream changes
---

45e4c90a23ccd6ccbed389d5c1b62f830d2c3757