From: Dan Brown <redacted>
Date: Wed, 1 Feb 2017 22:28:38 +0000 (+0000)
Subject: Merge branch 'v0.14'
X-Git-Tag: v0.15.0~1^2~18
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2431ce9f86cdbba5bbd7b179e3ab4cd66b6a1b77

Merge branch 'v0.14'
---

2431ce9f86cdbba5bbd7b179e3ab4cd66b6a1b77