From: Dan Brown <redacted>
Date: Sun, 10 Mar 2019 13:44:29 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.25.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6dafe773ffb6721ce31aab7e2dfddfcc61f8dc63

Merge branch 'master' into release
---

6dafe773ffb6721ce31aab7e2dfddfcc61f8dc63