From: ThibG <thib@sitedethib.com>
Date: Mon, 8 Apr 2019 16:17:22 +0000 (+0200)
Subject: Merge pull request #983 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=fc2f7ee8710b498c4533e229aff6391396aa7213;p=mastodon.git

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

Merge upstream changes
---

fc2f7ee8710b498c4533e229aff6391396aa7213