From: ThibG <thib@sitedethib.com>
Date: Sun, 15 Sep 2019 12:45:24 +0000 (+0200)
Subject: Merge pull request #1219 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=221bb05cf8d30d7912fd1f860af2552ff7914fd2;p=mastodon.git

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

Merge upstream changes
---

221bb05cf8d30d7912fd1f860af2552ff7914fd2