From: Dan Brown <redacted>
Date: Thu, 17 Oct 2019 20:09:05 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/c0shea/BookStack into c0shea-master
X-Git-Tag: v0.28.0~1^2~66
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8b4bfa4d780a3d586d0ad3dc64ff11822a0c3fbf?ds=inline;hp=--cc

Merge branch 'master' of git://github.com/c0shea/BookStack into c0shea-master
---

8b4bfa4d780a3d586d0ad3dc64ff11822a0c3fbf