From: Dan Brown <redacted>
Date: Sun, 20 Jan 2019 15:41:24 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.25.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4c561c7fa0600778bff3e8bcb94105672cbe4d7f

Merge branch 'master' into release
---

4c561c7fa0600778bff3e8bcb94105672cbe4d7f