From: Dan Brown <redacted>
Date: Sun, 4 Nov 2018 15:36:40 +0000 (+0000)
Subject: Merge branch 'v0.24-dev'
X-Git-Tag: v0.24.2~3^2~11
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/ffc1aa873ed8912c1400d83191d2b1485e59fca3

Merge branch 'v0.24-dev'
---

ffc1aa873ed8912c1400d83191d2b1485e59fca3