From: Dan Brown <redacted>
Date: Tue, 16 Mar 2021 12:45:12 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/ckleemann/BookStack into ckleemann-master
X-Git-Tag: v21.04~1^2~11^2~13
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/3d0e1bc9dbe3c144ad98bd22f6073fca43fc84e0

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

3d0e1bc9dbe3c144ad98bd22f6073fca43fc84e0