From: Dan Brown <redacted>
Date: Sat, 10 Nov 2018 15:35:35 +0000 (+0000)
Subject: Merge branch 'thomasjsn-master'
X-Git-Tag: v0.24.2~3^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/ebd4c3327d5ee8cdd666dfcb0a4bce8972a2039e

Merge branch 'thomasjsn-master'
---

ebd4c3327d5ee8cdd666dfcb0a4bce8972a2039e