From: Dan Brown <redacted>
Date: Fri, 8 Mar 2019 22:47:31 +0000 (+0000)
Subject: Merge branch 'master' into fix-1186
X-Git-Tag: v0.25.2~1^2~3^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/f467185e8610eb0e06482f665b07d2a3f3def9af

Merge branch 'master' into fix-1186
---

f467185e8610eb0e06482f665b07d2a3f3def9af