From: Dan Brown <redacted>
Date: Sun, 21 Aug 2016 14:02:37 +0000 (+0100)
Subject: Merge fixes from branch 'v0.11'
X-Git-Tag: v0.12.0~1^2~10
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/96c074bb5620565df1da27551d70fe6214218034

Merge fixes from branch 'v0.11'
---

96c074bb5620565df1da27551d70fe6214218034