From: Dan Brown <redacted>
Date: Sat, 31 Oct 2020 16:51:54 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.30.4~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/3dc3d4a63916f442102f15758f2e7d87a0deef43

Merge branch 'master' into release
---

3dc3d4a63916f442102f15758f2e7d87a0deef43