From: Dan Brown <redacted>
Date: Mon, 24 Sep 2018 15:32:30 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.24.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/db83ac7eaa9d5216fb15b6876d4ff3a6f2ec7e53

Merge branch 'master' into release
---

db83ac7eaa9d5216fb15b6876d4ff3a6f2ec7e53