From: Dan Brown <redacted>
Date: Sat, 26 Sep 2020 14:35:13 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/alexmannuk/BookStack into alexmannuk-master
X-Git-Tag: v0.30.1~1^2~9
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1f9704779919a2e094c17e8f556ec9cc92ac437b

Merge branch 'master' of git://github.com/alexmannuk/BookStack into alexmannuk-master
---

1f9704779919a2e094c17e8f556ec9cc92ac437b