From: Dan Brown <redacted>
Date: Mon, 5 Sep 2016 18:35:21 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.12.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/7caed3b0dbea4d289747d19b30893f4bcdef94e6

Merge branch 'master' into release
---

7caed3b0dbea4d289747d19b30893f4bcdef94e6