Merge branch 'MDL-69117-master-2' of git://github.com/bmbrands/moodle

author Andrew Nicols <andrew@nicols.co.uk>

Thu, 3 Sep 2020 00:38:54 +0000 (08:38 +0800)

committer Andrew Nicols <andrew@nicols.co.uk>

Thu, 3 Sep 2020 00:38:54 +0000 (08:38 +0800)
author Andrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 00:38:54 +0000 (08:38 +0800)
committer Andrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 00:38:54 +0000 (08:38 +0800)
diff --cc theme/boost/lib.php
Simple merge
diff --cc theme/boost/style/moodle.css
Simple merge
diff --cc theme/classic/style/moodle.css
Simple merge
author	Andrew Nicols <andrew@nicols.co.uk>
	Thu, 3 Sep 2020 00:38:54 +0000 (08:38 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Thu, 3 Sep 2020 00:38:54 +0000 (08:38 +0800)
		1	2
theme/boost/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/boost/style/moodle.css	patch \|	diff1 \|	diff2 \|	blob \| history
theme/classic/style/moodle.css	patch \|	diff1 \|	diff2 \|	blob \| history