From: Dan Brown <redacted>
Date: Sun, 5 Feb 2017 21:24:15 +0000 (+0000)
Subject: Merge bugfixes from  branch 'v0.14'
X-Git-Tag: v0.15.0~1^2~10
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a6128a1df12cc37a2fd7fce2ecc0e08ba9fb3c91

Merge bugfixes from  branch 'v0.14'
---

a6128a1df12cc37a2fd7fce2ecc0e08ba9fb3c91