From: Dan Brown <redacted>
Date: Thu, 21 Mar 2019 00:02:33 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.25.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/29a5c180f0c74c17c9fdb53e7bde04dde0cd592f

Merge branch 'master' into release
---

29a5c180f0c74c17c9fdb53e7bde04dde0cd592f