From: Dan Brown <redacted>
Date: Thu, 21 Mar 2019 19:43:48 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.25.4~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/13c9d7bc2d5532bfc49e7f18a529bed7fa16e474

Merge branch 'master' into release
---

13c9d7bc2d5532bfc49e7f18a529bed7fa16e474