From: David Yip <yipdw@member.fsf.org>
Date: Fri, 17 Nov 2017 20:35:16 +0000 (-0600)
Subject: Merge pull request #222 from yipdw/merge/tootsuite/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25;p=mastodon.git

Merge pull request #222 from yipdw/merge/tootsuite/master

Merge upstream (e28b33c.. 94c5a11)
---

6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25