From: ThibG <thib@sitedethib.com>
Date: Tue, 6 Aug 2019 15:25:54 +0000 (+0200)
Subject: Merge pull request #1191 from ThibG/glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8400ddca7155005ab79485ed6054c04ea3ca5667;p=mastodon.git

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

Merge upstream changes
---

8400ddca7155005ab79485ed6054c04ea3ca5667