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

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

Merge upstream changes
---

fad29fd23052cdf3d51a6e0eb03557554572d402