From: Dan Brown <redacted>
Date: Sat, 10 Nov 2018 16:09:14 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.24.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a059960b9e070a814f501934ae702f0f8d3d05c5

Merge branch 'master' into release
---

a059960b9e070a814f501934ae702f0f8d3d05c5