From: Dan Brown <redacted>
Date: Sat, 12 Jan 2019 22:47:07 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.25.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/63a345bc9360ce683e6cdfff9a3b3613a9a3b057

Merge branch 'master' into release
---

63a345bc9360ce683e6cdfff9a3b3613a9a3b057