From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Oct 2016 00:29:51 +0000 (+0200)
Subject: Merge branch 'avatar-component-testing' of https://github.com/kschaper/mastodon into... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=44856fb6412f24e7c2c34df3a8aa50860767bb6c;p=mastodon.git

Merge branch 'avatar-component-testing' of https://github.com/kschaper/mastodon into kschaper-avatar-component-testing
---

44856fb6412f24e7c2c34df3a8aa50860767bb6c