From: Dan Brown <redacted>
Date: Sat, 30 Jan 2021 17:15:23 +0000 (+0000)
Subject: Merge branch 'patch-1' of git://github.com/l1n/BookStack into l1n-patch-1
X-Git-Tag: v21.04~1^2~17
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4d3194d784397be2d16d74adbe20998fbb805104

Merge branch 'patch-1' of git://github.com/l1n/BookStack into l1n-patch-1
---

4d3194d784397be2d16d74adbe20998fbb805104