From: Dan Brown <redacted>
Date: Sun, 4 Feb 2018 18:14:41 +0000 (+0000)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.20.0~1^2~6
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2533db260dfa95e81ac1238f434f6670d1133b06

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

2533db260dfa95e81ac1238f434f6670d1133b06