From: Surinna Curtis <ekiru.0@gmail.com>
Date: Thu, 16 Nov 2017 07:38:26 +0000 (-0600)
Subject: Merge pull request #216 from glitch-soc/merge-upstream-3023725
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ee560abdbe7a2caf0f7ac6137faf248bbaff9a93;p=mastodon.git

Merge pull request #216 from glitch-soc/merge-upstream-3023725

Merge upstream at commit 3023725
---

ee560abdbe7a2caf0f7ac6137faf248bbaff9a93