From: Dan Brown <redacted>
Date: Sun, 3 Jan 2021 22:32:40 +0000 (+0000)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.31.0~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/dc996adb202e509735beba4c7ebf299133e19131?hp=-c

Merge branch 'master' into release
---

dc996adb202e509735beba4c7ebf299133e19131