From: Dan Brown <redacted>
Date: Mon, 24 Sep 2018 14:59:39 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.24.1~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/3ca9dddf6184aa41c8f3f63e7b82fcb9b3733192

Merge branch 'master' into release
---

3ca9dddf6184aa41c8f3f63e7b82fcb9b3733192