From: ThibG <thib@sitedethib.com>
Date: Mon, 20 Jan 2020 18:20:40 +0000 (+0100)
Subject: Merge pull request #1264 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=a8c109baca4d02cc8aed454e231518c1f8ec1844;p=mastodon.git

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

Merge upstream changes
---

a8c109baca4d02cc8aed454e231518c1f8ec1844