From: Dan Brown <redacted>
Date: Sun, 7 May 2017 18:35:34 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.16.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/dc0bf8ad4e24dc3f45353323848ca8d14b69c22a

Merge branch 'master' into release
---

dc0bf8ad4e24dc3f45353323848ca8d14b69c22a