Merge branch 'MDL-57536-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2017 17:59:16 +0000 (18:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jan 2017 17:59:16 +0000 (18:59 +0100)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge