From: Dan Brown <redacted>
Date: Fri, 30 Mar 2018 13:10:36 +0000 (+0100)
Subject: Merge branch 'master' of github.com:BookStackApp/BookStack
X-Git-Tag: v0.21.0~1^2~21
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/58a6b2df7db982f0575e79493257ef68a8468a81?ds=inline;hp=--cc

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

58a6b2df7db982f0575e79493257ef68a8468a81