From: Dan Brown <redacted>
Date: Tue, 13 Oct 2020 21:50:30 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.30.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4d2205853a9222aa7eb1f3642dd429c9ee7970fc

Merge branch 'master' into release
---

4d2205853a9222aa7eb1f3642dd429c9ee7970fc