]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'ineffyble-fix/error-pages'
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 21 Jan 2017 21:31:19 +0000 (22:31 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Sat, 21 Jan 2017 21:31:19 +0000 (22:31 +0100)

Trivial merge