From: Dan Brown <redacted>
Date: Mon, 24 Sep 2018 11:08:21 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.24.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9d67efb4a47865586912b6910c33d21c022cbf3d

Merge branch 'master' into release
---

9d67efb4a47865586912b6910c33d21c022cbf3d