From: Dan Brown <redacted>
Date: Sun, 3 Jul 2016 09:52:04 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.11.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/7113807f123a9143b9cd77bcd98c08d000e3cfe8

Merge branch 'master' into release
---

7113807f123a9143b9cd77bcd98c08d000e3cfe8