From: Dan Brown <redacted>
Date: Sat, 1 Dec 2018 13:57:23 +0000 (+0000)
Subject: Merge branch 'master' into 2019-design
X-Git-Tag: v0.26.0~1^2~23^2~59
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d39fc843019b9a4b7d7eebc7544edb8c86e245db

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

d39fc843019b9a4b7d7eebc7544edb8c86e245db