From: Dan Brown <redacted>
Date: Thu, 27 Jul 2017 18:09:44 +0000 (+0100)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.17.4~1^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/fea139d8e7ed7887624e5f0f24df0b7dea77f964

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

fea139d8e7ed7887624e5f0f24df0b7dea77f964