From: ThibG <thib@sitedethib.com>
Date: Sun, 27 Jan 2019 13:23:24 +0000 (+0100)
Subject: Merge pull request #899 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f1adce7f6dfb5cdd36f53f939a006e4d81594229;p=mastodon.git

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

Merge upstream changes
---

f1adce7f6dfb5cdd36f53f939a006e4d81594229