From: Dan Brown <redacted>
Date: Sun, 1 Oct 2017 12:19:41 +0000 (+0100)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.18.2~1^2~3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/6b1980c4f3aed923c267356c97b5d14545e6a8f6

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

6b1980c4f3aed923c267356c97b5d14545e6a8f6