From: Dan Brown <redacted>
Date: Tue, 27 Nov 2018 21:51:32 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.24.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4b01f8934b494713e6bb764109531bf05c1c08ab

Merge branch 'master' into release
---

4b01f8934b494713e6bb764109531bf05c1c08ab