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

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

Merge upstream changes
---

bd3567b3f8988998384f5031daa2fcfc06393853