From: Svante Bengtson <redacted>
Date: Mon, 22 Feb 2016 23:05:35 +0000 (+0100)
Subject: Merge branch 'mockup' of https://github.com/freenode/web-7.0.git into mockup
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/8b3a1366556517433eaee8e78d5529937ea837dd

Merge branch 'mockup' of https://github.com/freenode/web-7.0.git into mockup
---

8b3a1366556517433eaee8e78d5529937ea837dd