From: Dan Brown <redacted>
Date: Mon, 27 Feb 2017 16:58:20 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.15.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/5335c973b4510d314cc5fa67b271bb4da18563ee

Merge branch 'master' into release
---

5335c973b4510d314cc5fa67b271bb4da18563ee