From: ThibG <thib@sitedethib.com>
Date: Tue, 11 Jun 2019 20:18:41 +0000 (+0200)
Subject: Merge pull request #1105 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cde30407c6bfaaaa34f8b95c16f1b19cb0c41479;p=mastodon.git

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

Merge upstream changes
---

cde30407c6bfaaaa34f8b95c16f1b19cb0c41479