From: ThibG <thib@sitedethib.com>
Date: Mon, 1 Jul 2019 17:30:46 +0000 (+0200)
Subject: Merge pull request #1148 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=687680f241f0244ad6998b7c76f0a96c22498b8a;p=mastodon.git

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

Merge upstream changes
---

687680f241f0244ad6998b7c76f0a96c22498b8a