From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 21 Jan 2017 21:31:19 +0000 (+0100)
Subject: Merge branch 'ineffyble-fix/error-pages'
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=500278eb4c73506cd965c3abc06a2449c8071e1e;p=mastodon.git

Merge branch 'ineffyble-fix/error-pages'
---

500278eb4c73506cd965c3abc06a2449c8071e1e