Merge branch 'MDL-51633_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 15:40:34 +0000 (17:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 15:40:34 +0000 (17:40 +0200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge