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

author Dan Brown <redacted>

Sat, 2 Jan 2021 15:45:18 +0000 (15:45 +0000)

committer Dan Brown <redacted>

Sat, 2 Jan 2021 15:45:18 +0000 (15:45 +0000)
author Dan Brown <redacted>
Sat, 2 Jan 2021 15:45:18 +0000 (15:45 +0000)
committer Dan Brown <redacted>
Sat, 2 Jan 2021 15:45:18 +0000 (15:45 +0000)
diff --cc app/Config/app.php
Simple merge
diff --cc resources/lang/en/settings.php
Simple merge
author	Dan Brown <redacted>
	Sat, 2 Jan 2021 15:45:18 +0000 (15:45 +0000)
committer	Dan Brown <redacted>
	Sat, 2 Jan 2021 15:45:18 +0000 (15:45 +0000)
		1	2
app/Config/app.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/en/settings.php	patch \|	diff1 \|	diff2 \|	blob \| history