Merge branch 'MDL-62200-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:04:08 +0000 (18:04 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:04:08 +0000 (18:04 +0200)
1  2 
theme/boost/scss/moodle/core.scss
theme/bootstrapbase/style/moodle.css

Simple merge
Simple merge