Merge branch 'MDL-58055-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 22:22:19 +0000 (00:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Apr 2017 22:22:19 +0000 (00:22 +0200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge