From: David Yip <yipdw@member.fsf.org>
Date: Sun, 31 Dec 2017 00:24:38 +0000 (-0600)
Subject: Merge pull request #291 from glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d817c0a958efda990af654f72d15d6f42b43dd49;p=mastodon.git

Merge pull request #291 from glitch-soc/merge-upstream

Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
---

d817c0a958efda990af654f72d15d6f42b43dd49