Merge branch 'patch-1' of git://github.com/DeftNerd/BookStack into DeftNerd-patch-1

author Dan Brown <redacted>

Thu, 17 Oct 2019 13:58:20 +0000 (14:58 +0100)

committer Dan Brown <redacted>

Thu, 17 Oct 2019 13:58:20 +0000 (14:58 +0100)
author Dan Brown <redacted>
Thu, 17 Oct 2019 13:58:20 +0000 (14:58 +0100)
committer Dan Brown <redacted>
Thu, 17 Oct 2019 13:58:20 +0000 (14:58 +0100)
diff --cc resources/views/settings/maintenance.blade.php
Simple merge
author	Dan Brown <redacted>
	Thu, 17 Oct 2019 13:58:20 +0000 (14:58 +0100)
committer	Dan Brown <redacted>
	Thu, 17 Oct 2019 13:58:20 +0000 (14:58 +0100)