From: Dan Brown <redacted>
Date: Sat, 2 May 2020 10:48:48 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.29.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/87d1d3423b419e7ddf01fc78e393a424441b8252

Merge branch 'master' into release
---

87d1d3423b419e7ddf01fc78e393a424441b8252