From: Dan Brown <redacted>
Date: Sat, 31 Oct 2020 22:11:27 +0000 (+0000)
Subject: Merge branch 'fixes' of git://github.com/imanghafoori1/BookStack into imanghafoori1... 
X-Git-Tag: v0.31.0~3^2~39
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/474770af51c9d6d775e6458e636c8f941a68ba98?ds=inline

Merge branch 'fixes' of git://github.com/imanghafoori1/BookStack into imanghafoori1-fixes
---

474770af51c9d6d775e6458e636c8f941a68ba98