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

Merge branch 'master' into release
---

034c1e289d7985ea1fbba50474dca91c02bfb58b