From: Dan Brown <redacted>
Date: Fri, 6 Mar 2020 20:10:57 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/ch0wm3in/BookStack into ch0wm3in-master
X-Git-Tag: v0.28.3~1^2~18
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/30db8af460ad41cf4470b3fcee2cb4cffb28a807

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

30db8af460ad41cf4470b3fcee2cb4cffb28a807