From: Dan Brown <redacted>
Date: Wed, 2 Jun 2021 20:44:39 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/ffranchina/BookStack into ffranchina... 
X-Git-Tag: v21.05.1~1^2~7^2~2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2dfb1ae3ee9883e00f7eec050871f906c804fe7b

Merge branch 'master' of https://github.com/ffranchina/BookStack into ffranchina-master
---

2dfb1ae3ee9883e00f7eec050871f906c804fe7b