From: Dan Brown <redacted>
Date: Sun, 5 Feb 2017 21:21:54 +0000 (+0000)
Subject: Merge branch 'v0.14' into release
X-Git-Tag: v0.14.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9926e23bc870cc111c35e58184fad11670346ce6

Merge branch 'v0.14' into release
---

9926e23bc870cc111c35e58184fad11670346ce6