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

Merge branch 'master' into release
---

a4c9a8491b85ccddc9769006e3334dfe232af381