From: Dan Brown <redacted>
Date: Sat, 17 Mar 2018 13:05:37 +0000 (+0000)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.20.1~1^2~25
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/b64940be8264f6e4b0f96ee8717042f0e5cc5dd6?ds=inline;hp=--cc

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

b64940be8264f6e4b0f96ee8717042f0e5cc5dd6