From: beatrix <beatrix.bitrot@gmail.com>
Date: Wed, 18 Oct 2017 21:57:42 +0000 (-0400)
Subject: Merge pull request #188 from glitch-soc/merge-upstream-2-0-0
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c75665127878f41af2547b12b8723963c04d305b;p=mastodon.git

Merge pull request #188 from glitch-soc/merge-upstream-2-0-0

Merge with upstream v2.0.0
---

c75665127878f41af2547b12b8723963c04d305b