Merge branch 'feature-send-test-email' of git://github.com/timoschwarzer/BookStack...

author Dan Brown <redacted>

Wed, 23 Oct 2019 18:53:51 +0000 (19:53 +0100)

committer Dan Brown <redacted>

Wed, 23 Oct 2019 18:53:51 +0000 (19:53 +0100)
author Dan Brown <redacted>
Wed, 23 Oct 2019 18:53:51 +0000 (19:53 +0100)
committer Dan Brown <redacted>
Wed, 23 Oct 2019 18:53:51 +0000 (19:53 +0100)
diff --cc resources/lang/en/settings.php
Simple merge
diff --cc resources/views/settings/maintenance.blade.php
Simple merge
author	Dan Brown <redacted>
	Wed, 23 Oct 2019 18:53:51 +0000 (19:53 +0100)
committer	Dan Brown <redacted>
	Wed, 23 Oct 2019 18:53:51 +0000 (19:53 +0100)
		1	2
resources/lang/en/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/settings/maintenance.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history