From: Dan Brown <redacted>
Date: Sun, 14 Aug 2016 11:37:48 +0000 (+0100)
Subject: Merge branch 'v0.11' into release
X-Git-Tag: v0.11.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d2a5ab49ed60c86f2c24463a03062f15d406bd31

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

d2a5ab49ed60c86f2c24463a03062f15d406bd31