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

Trivial merge