Merge branch 'MDL-48350-M32' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2016 18:30:11 +0000 (20:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2016 18:30:11 +0000 (20:30 +0200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge