From: Dan Brown <redacted>
Date: Sat, 27 Jun 2020 16:11:11 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/drzippie/BookStack into drzippie-master
X-Git-Tag: v0.30.0~1^2~40
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8bc3e0f31a713fc2f398416e960dd84d70051426

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

8bc3e0f31a713fc2f398416e960dd84d70051426