Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Nov 2016 01:17:10 +0000 (02:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Nov 2016 01:17:10 +0000 (02:17 +0100)
1  2 
theme/boost/scss/moodle/modules.scss
theme/bootstrapbase/style/moodle.css

Simple merge
Simple merge