From: Olivia Mossberg <hakurou46@gmail.com>
Date: Sun, 2 Apr 2017 15:04:31 +0000 (+0200)
Subject: Merge branch 'master' of github.com:tootsuite/mastodon
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=30da6440d06803fe9797dc5a5741c49da93892b4;p=mastodon.git

Merge branch 'master' of github.com:tootsuite/mastodon

It's just an upstream merge
---

30da6440d06803fe9797dc5a5741c49da93892b4