From: Dan Brown <redacted>
Date: Fri, 28 Jul 2017 12:03:36 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.17.4~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b7a96c646615fddcb120d278a968e3498b606cce

Merge branch 'master' into release
---

b7a96c646615fddcb120d278a968e3498b606cce