From: Dan Brown <redacted>
Date: Sat, 14 Mar 2020 22:31:11 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.28.3~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0d31a8e3f1faa0a741aff6207ad5f9af244fc224

Merge branch 'master' into release
---

0d31a8e3f1faa0a741aff6207ad5f9af244fc224