From: David Yip <yipdw@member.fsf.org>
Date: Fri, 17 Nov 2017 23:58:13 +0000 (-0600)
Subject: Merge pull request #224 from yipdw/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=284e2cde81811d6289dde9542f9c987062f9e7c2;p=mastodon.git

Merge pull request #224 from yipdw/merge-upstream

Merge upstream (tootsuite/mastodon#5703)
---

284e2cde81811d6289dde9542f9c987062f9e7c2