From: Jenkins <jenkins@jenkins.ninjawedding.org>
Date: Thu, 23 Nov 2017 21:17:14 +0000 (+0000)
Subject: Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=faad820458401b5a01f24d4da4bf2acf59ef440d;p=mastodon.git

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
---

faad820458401b5a01f24d4da4bf2acf59ef440d