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

author Dan Brown <redacted>

Sat, 2 Jan 2021 16:25:59 +0000 (16:25 +0000)

committer Dan Brown <redacted>

Sat, 2 Jan 2021 16:25:59 +0000 (16:25 +0000)
author Dan Brown <redacted>
Sat, 2 Jan 2021 16:25:59 +0000 (16:25 +0000)
committer Dan Brown <redacted>
Sat, 2 Jan 2021 16:25:59 +0000 (16:25 +0000)
diff --cc app/Entities/Repos/PageRepo.php
Simple merge
diff --cc resources/lang/en/entities.php
Simple merge
author	Dan Brown <redacted>
	Sat, 2 Jan 2021 16:25:59 +0000 (16:25 +0000)
committer	Dan Brown <redacted>
	Sat, 2 Jan 2021 16:25:59 +0000 (16:25 +0000)
		1	2
app/Entities/Repos/PageRepo.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/lang/en/entities.php	patch \|	diff1 \|	diff2 \|	blob \| history