Merge branch 'MDL-61161-master' of https://github.com/mackensen/moodle

author David Monllao <davidm@moodle.com>

Wed, 26 Sep 2018 08:23:39 +0000 (10:23 +0200)

committer David Monllao <davidm@moodle.com>

Wed, 26 Sep 2018 08:23:39 +0000 (10:23 +0200)
author David Monllao <davidm@moodle.com>
Wed, 26 Sep 2018 08:23:39 +0000 (10:23 +0200)
committer David Monllao <davidm@moodle.com>
Wed, 26 Sep 2018 08:23:39 +0000 (10:23 +0200)
diff --cc admin/settings/appearance.php
Simple merge
diff --cc course/lib.php
Simple merge
diff --cc course/tests/courselib_test.php
Simple merge
diff --cc lang/en/admin.php
Simple merge
author	David Monllao <davidm@moodle.com>
	Wed, 26 Sep 2018 08:23:39 +0000 (10:23 +0200)
committer	David Monllao <davidm@moodle.com>
	Wed, 26 Sep 2018 08:23:39 +0000 (10:23 +0200)
		1	2
admin/settings/appearance.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
course/tests/courselib_test.php	patch \|	diff1 \|	diff2 \|	blob \| history
lang/en/admin.php	patch \|	diff1 \|	diff2 \|	blob \| history