From: Dan Brown <redacted>
Date: Sun, 10 Sep 2017 15:36:47 +0000 (+0100)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.18.0~1^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2329a5cedfef057a39377dc47b461894c7960379

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

2329a5cedfef057a39377dc47b461894c7960379