From: Dan Brown <redacted>
Date: Sat, 14 Jul 2018 13:14:37 +0000 (+0100)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.23.0~1^2~9
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/985e214d94675b262d5fe1c2a8e38de8d8d4e61d

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

985e214d94675b262d5fe1c2a8e38de8d8d4e61d