From: Dan Brown <redacted>
Date: Tue, 12 May 2020 21:33:27 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.29.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2ff90e2ff011866016f0371bd24c6ab2aa09ca30

Merge branch 'master' into release
---

2ff90e2ff011866016f0371bd24c6ab2aa09ca30