From: David Yip <yipdw@member.fsf.org>
Date: Mon, 16 Oct 2017 20:46:12 +0000 (-0500)
Subject: Merge pull request #181 from glitch-soc/upstream-merge-again
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7c44ad63550ccf3cb7532440f79196b20dc24c5d;p=mastodon.git

Merge pull request #181 from glitch-soc/upstream-merge-again

Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}
---

7c44ad63550ccf3cb7532440f79196b20dc24c5d