From: Dan Brown <redacted>
Date: Sat, 22 Jul 2017 16:26:44 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.17.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d599b77b6fe8cf8c4b7e311d8a0c9094105e3560

Merge branch 'master' into release
---

d599b77b6fe8cf8c4b7e311d8a0c9094105e3560