From: David Yip <yipdw@member.fsf.org>
Date: Fri, 27 Oct 2017 14:45:25 +0000 (-0500)
Subject: Merge branch 'master' into gs-master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=870d71b78be74b7fab4892a79a87aff39b1e2726;p=mastodon.git

Merge branch 'master' into gs-master
---

870d71b78be74b7fab4892a79a87aff39b1e2726