Merge branch 'MDL-69391-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 03:32:31 +0000 (11:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Sep 2020 03:32:31 +0000 (11:32 +0800)
1  2 
calendar/tests/behat/calendar.feature
theme/boost/scss/moodle/calendar.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css

Simple merge
Simple merge
Simple merge
Simple merge