From: Dan Brown <redacted>
Date: Sat, 26 Sep 2020 16:50:25 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.30.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/616c62703e0273502896c442419de6007f70a571

Merge branch 'master' into release
---

616c62703e0273502896c442419de6007f70a571