Merge branch 'MDL-69998-master-enfix' of git://github.com/mudrd8mz/moodle into master

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 27 Oct 2020 23:41:53 +0000 (00:41 +0100)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Tue, 27 Oct 2020 23:41:53 +0000 (00:41 +0100)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Oct 2020 23:41:53 +0000 (00:41 +0100)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Oct 2020 23:41:53 +0000 (00:41 +0100)
diff --cc lang/en/admin.php
Simple merge
diff --cc lang/en/moodle.php
Simple merge
diff --cc lang/en/role.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 27 Oct 2020 23:41:53 +0000 (00:41 +0100)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 27 Oct 2020 23:41:53 +0000 (00:41 +0100)
		1	2
lang/en/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/moodle.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/role.php	patch \|	diff1 \|	diff2 \|	blob \| history