From: David Yip <yipdw@member.fsf.org>
Date: Tue, 9 Jan 2018 23:01:23 +0000 (-0600)
Subject: Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=622c8fdb75f20f1aee73b5db6d2dc90416bb3b08;p=mastodon.git

Merge pull request #314 from chriswmartin/merge-vanilla-updates-2

Merge vanilla updates into glitch - round 2
---

622c8fdb75f20f1aee73b5db6d2dc90416bb3b08