From: beatrix <beatrix.bitrot@gmail.com>
Date: Tue, 26 Dec 2017 22:03:29 +0000 (-0500)
Subject: Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7347bc733418651216f22f224caf656471499a08;p=mastodon.git

Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch

Merge various small vanilla updates into glitch
---

7347bc733418651216f22f224caf656471499a08