From: Dan Brown <redacted>
Date: Fri, 4 Jun 2021 22:08:59 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v21.05.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/fa62c79b173d9b2850bd60d5e3fffb07f33a3d37

Merge branch 'master' into release
---

fa62c79b173d9b2850bd60d5e3fffb07f33a3d37