From: Dan Brown <redacted>
Date: Wed, 20 Sep 2017 19:27:50 +0000 (+0100)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.18.1~1^2~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/df0a9824338e56dcbedcb2967680c4a04e1010ea

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

df0a9824338e56dcbedcb2967680c4a04e1010ea