From: Dan Brown <redacted>
Date: Mon, 13 Apr 2020 15:10:11 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.29.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2120db12b2720bb935fd9e1b1b81f65669c871dc?hp=-c

Merge branch 'master' into release
---

2120db12b2720bb935fd9e1b1b81f65669c871dc