From: Dan Brown <redacted>
Date: Tue, 28 Apr 2020 11:30:09 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.29.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/965dd97f54ca385695fc8dd3a59bb930b429a147

Merge branch 'master' into release
---

965dd97f54ca385695fc8dd3a59bb930b429a147