From: Dan Brown <redacted>
Date: Sun, 15 Jul 2018 18:36:28 +0000 (+0100)
Subject: Merge branch 'brennanmurphy-master'
X-Git-Tag: v0.23.0~1^2~8
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9d2e65b73d4d798f5695315beabb848746a9d212

Merge branch 'brennanmurphy-master'
---

9d2e65b73d4d798f5695315beabb848746a9d212