From: Dan Brown <redacted>
Date: Sat, 2 Jan 2021 15:45:18 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/Swoy/BookStack into Swoy-master
X-Git-Tag: v0.31.0~3^2~8
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/a04a800258b726876ff2badffe903b247aa0f676

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

a04a800258b726876ff2badffe903b247aa0f676