From: Dan Brown <redacted>
Date: Wed, 30 Sep 2020 21:44:17 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: v0.30.2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/76e30869e1dcdb67cb37fccd104dcce01f2ae717

Merge branch 'master' into release
---

76e30869e1dcdb67cb37fccd104dcce01f2ae717