Merge branch 'MDL-65094-master' of git://github.com/rezaies/moodle

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

Thu, 4 Apr 2019 20:32:52 +0000 (22:32 +0200)

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

Thu, 4 Apr 2019 20:32:52 +0000 (22:32 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Apr 2019 20:32:52 +0000 (22:32 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Apr 2019 20:32:52 +0000 (22:32 +0200)
diff --cc admin/renderer.php
Simple merge
diff --cc lib/moodlelib.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 4 Apr 2019 20:32:52 +0000 (22:32 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 4 Apr 2019 20:32:52 +0000 (22:32 +0200)
		1	2
admin/renderer.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/moodlelib.php	patch \|	diff1 \|	diff2 \|	blob \| history