From: Dan Brown <redacted>
Date: Sat, 15 Feb 2020 22:07:17 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.28.1~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/e7cc75c74dd3f90f219c2cfdc6cd9ba45f369a4a

Merge branch 'master' into release
---

e7cc75c74dd3f90f219c2cfdc6cd9ba45f369a4a