From: Dan Brown <redacted>
Date: Thu, 2 Sep 2021 20:12:06 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v21.08.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c6773a8c9faf4bcf0be8a31e902fe74aa112d78a

Merge branch 'master' into release
---

c6773a8c9faf4bcf0be8a31e902fe74aa112d78a