From: Dan Brown <redacted>
Date: Sun, 21 Aug 2016 13:55:11 +0000 (+0100)
Subject: Merge branch 'v0.11' into release
X-Git-Tag: v0.11.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4b1d08ba998b2678f293bb114d17229b6fca2f4c

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

4b1d08ba998b2678f293bb114d17229b6fca2f4c