From: ThibG <thib@sitedethib.com>
Date: Fri, 6 Sep 2019 10:06:59 +0000 (+0200)
Subject: Merge pull request #1211 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=286bf110c3e69042049968440f1eb99372a7e0e6;p=mastodon.git

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

Merge upstream changes
---

286bf110c3e69042049968440f1eb99372a7e0e6