Merge branch 'MDL-68529' of https://github.com/Chocolate-lightning/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 14 May 2020 04:51:35 +0000 (12:51 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 14 May 2020 04:51:35 +0000 (12:51 +0800)
1  2 
course/amd/build/activitychooser.min.js
course/amd/build/activitychooser.min.js.map
course/amd/build/local/activitychooser/dialogue.min.js
course/amd/build/local/activitychooser/dialogue.min.js.map
lib/amd/build/modal.min.js
lib/amd/build/modal.min.js.map
theme/boost/scss/moodle/core.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css

index 3bf1b45,2d78a9d..b3f553f
Binary files differ
index bf0f119,972b779..1b3b1b4
Binary files differ
index a2acd22,c8ac6e4..6ebad58
Binary files differ
Simple merge
Simple merge
Simple merge