From: Dan Brown <redacted>
Date: Sun, 1 Oct 2017 17:12:07 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.18.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a08d80e1cc3567ce1e175c21971c64ff1abd8429

Merge branch 'master' into release
---

a08d80e1cc3567ce1e175c21971c64ff1abd8429