]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'kschaper-avatar-component-testing' into development
authorEugen Rochko <eugen@zeonfederated.com>
Fri, 14 Oct 2016 00:30:08 +0000 (02:30 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 14 Oct 2016 00:30:08 +0000 (02:30 +0200)

Trivial merge