Merge branch 'MDL-69395_310' of github.com:stronk7/moodle into MOODLE_310_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Sep 2020 15:02:08 +0000 (17:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Sep 2020 15:02:08 +0000 (17:02 +0200)
1  2 
theme/classic/scss/preset/default.scss
theme/classic/style/moodle.css

Simple merge