From: Dan Brown <redacted>
Date: Sun, 12 Sep 2021 15:30:35 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v21.08.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b8fcefc7940ff3658bc0766a885535c783330e5b

Merge branch 'master' into release
---

b8fcefc7940ff3658bc0766a885535c783330e5b