From: Dan Brown <redacted>
Date: Sun, 22 May 2016 14:11:50 +0000 (+0100)
Subject: Merge branch 'master' into release for version v0.10
X-Git-Tag: v0.10.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/7e3b40424057d98a8bef61e02487e0d41a62302e

Merge branch 'master' into release for version v0.10
---

7e3b40424057d98a8bef61e02487e0d41a62302e