From: Dan Brown <redacted>
Date: Tue, 6 Sep 2016 19:49:15 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.12.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d704e1dbbab32856ee9eb10bdac7be8e22bea4a2

Merge branch 'master' into release
---

d704e1dbbab32856ee9eb10bdac7be8e22bea4a2