From: Dan Brown <redacted>
Date: Sat, 26 Jun 2021 10:19:21 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/arjvand/BookStack into arjvand-master
X-Git-Tag: v21.08~1^2~33
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/8a9505bf8cf0b6d7c7ac0fa5c72b5ac25e4f7b92?ds=inline;hp=--cc

Merge branch 'master' of https://github.com/arjvand/BookStack into arjvand-master
---

8a9505bf8cf0b6d7c7ac0fa5c72b5ac25e4f7b92