From: ThibG <thib@sitedethib.com>
Date: Mon, 21 Jan 2019 10:35:31 +0000 (+0100)
Subject: Merge pull request #889 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6f53c4fc79ea7abd40b7fc224cecd8be63135b08;p=mastodon.git

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

Merge upstream changes (v2.7.0)
---

6f53c4fc79ea7abd40b7fc224cecd8be63135b08