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

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

Merge upstream changes
---

bdf4f56f9a9052668e7cce1ce7863268e03d9c86