From: ThibG <thib@sitedethib.com>
Date: Tue, 26 Feb 2019 20:40:28 +0000 (+0100)
Subject: Merge pull request #930 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ff2270cd061b2dc3fc86a5b2bd77d0a3408b5716;p=mastodon.git

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

Merge upstream changes
---

ff2270cd061b2dc3fc86a5b2bd77d0a3408b5716