From: Dan Brown <redacted>
Date: Sun, 22 Apr 2018 11:26:21 +0000 (+0100)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.21.0~1^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/0306253c45b63812ef01be109c23abd0b124be71

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

0306253c45b63812ef01be109c23abd0b124be71