From: Dan Brown <redacted>
Date: Sat, 30 Mar 2019 13:17:29 +0000 (+0000)
Subject: Merge branch 'master' into 2019-design
X-Git-Tag: v0.26.0~1^2~23^2~29
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/53a26a365c679f27f7ba0ddb20b0cc473d3a8ab4

Merge branch 'master' into 2019-design
---

53a26a365c679f27f7ba0ddb20b0cc473d3a8ab4