From: Dan Brown <redacted>
Date: Mon, 10 Jul 2017 19:51:25 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.17.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b35f6dbb03f254957bc6af351d7546abaeba661b

Merge branch 'master' into release
---

b35f6dbb03f254957bc6af351d7546abaeba661b