From: Dan Brown <redacted>
Date: Wed, 2 Jun 2021 20:57:23 +0000 (+0100)
Subject: Merge branch 'ffranchina-master'
X-Git-Tag: v21.05.1~1^2~7
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/9382d647d7fece41490e03eab8ad60e5e1ed9ab5

Merge branch 'ffranchina-master'
---

9382d647d7fece41490e03eab8ad60e5e1ed9ab5