From: Dan Brown <redacted>
Date: Sun, 5 Mar 2017 15:49:47 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.15.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/bce941db3f804865b43c699e86c020b40b342407

Merge branch 'master' into release
---

bce941db3f804865b43c699e86c020b40b342407