From: Dan Brown <redacted>
Date: Mon, 4 Feb 2019 19:57:43 +0000 (+0000)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.25.2~1^2~14
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/df6f6e2d77652e3de15d34c3bbc170fe55a48815

Merge branch 'master' of github.com:BookStackApp/BookStack
---

df6f6e2d77652e3de15d34c3bbc170fe55a48815