From: Dan Brown <redacted>
Date: Mon, 4 Oct 2021 16:10:40 +0000 (+0100)
Subject: Merge branch 'conflict_warnings' of https://github.com/MatthieuParis/BookStack into... 
X-Git-Tag: v21.08.5~1^2~9
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/756b55bbffedb6e5fde91f9fbc61f5a382f20705

Merge branch 'conflict_warnings' of https://github.com/MatthieuParis/BookStack into MatthieuParis-conflict_warnings
---

756b55bbffedb6e5fde91f9fbc61f5a382f20705