From: David Huerta <huertanix@users.noreply.github.com>
Date: Fri, 7 Apr 2017 23:46:07 +0000 (-0400)
Subject: Merge branch 'master' into patch-1
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4fb24a70d38ff1097f36069caf8532741c486135;p=mastodon.git

Merge branch 'master' into patch-1
---

4fb24a70d38ff1097f36069caf8532741c486135