From: Dan Brown <redacted>
Date: Thu, 31 Dec 2015 17:22:03 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.6.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/910faab88e34d1a0f50d7d422c79a5e9bf64b28b

Merge branch 'master' into release
---

910faab88e34d1a0f50d7d422c79a5e9bf64b28b