Merge branch 'MDL-64281-master' of git://github.com/jleyva/moodle

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

Wed, 20 Mar 2019 23:27:27 +0000 (00:27 +0100)

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

Wed, 20 Mar 2019 23:27:27 +0000 (00:27 +0100)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2019 23:27:27 +0000 (00:27 +0100)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2019 23:27:27 +0000 (00:27 +0100)
diff --cc lang/en/admin.php
Simple merge
diff --cc lib/weblib.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 20 Mar 2019 23:27:27 +0000 (00:27 +0100)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 20 Mar 2019 23:27:27 +0000 (00:27 +0100)
		1	2
lang/en/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/weblib.php	patch \|	diff1 \|	diff2 \|	blob \| history