Merge branch 'MDL-69391-39' of git://github.com/junpataleta/moodle into MOODLE_39_STABLE

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

Thu, 3 Sep 2020 03:48:49 +0000 (11:48 +0800)

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

Thu, 3 Sep 2020 03:48:49 +0000 (11:48 +0800)
author Andrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 03:48:49 +0000 (11:48 +0800)
committer Andrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 03:48:49 +0000 (11:48 +0800)
diff --cc theme/boost/scss/moodle/calendar.scss
Simple merge
diff --cc theme/boost/scss/preset/default.scss
Simple merge
diff --cc theme/boost/style/moodle.css
Simple merge
diff --cc theme/classic/scss/preset/default.scss
Simple merge
diff --cc theme/classic/style/moodle.css
Simple merge
author	Andrew Nicols <andrew@nicols.co.uk>
	Thu, 3 Sep 2020 03:48:49 +0000 (11:48 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Thu, 3 Sep 2020 03:48:49 +0000 (11:48 +0800)
		1	2
theme/boost/scss/moodle/calendar.scss	patch \|	diff1 \|	diff2 \|	blob \| history
theme/boost/scss/preset/default.scss	patch \|	diff1 \|	diff2 \|	blob \| history
theme/boost/style/moodle.css	patch \|	diff1 \|	diff2 \|	blob \| history
theme/classic/scss/preset/default.scss	patch \|	diff1 \|	diff2 \|	blob \| history
theme/classic/style/moodle.css	patch \|	diff1 \|	diff2 \|	blob \| history