From: Eugen <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2017 11:07:36 +0000 (+0200)
Subject: Merge branch 'master' into fix-object-type-nil-exception
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c9b23a93c7576aae2dfc5d526345599142393ca8;p=mastodon.git

Merge branch 'master' into fix-object-type-nil-exception
---

c9b23a93c7576aae2dfc5d526345599142393ca8