Merge branch 'wip-MDL-59775-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Sep 2017 09:44:47 +0000 (11:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Sep 2017 09:44:47 +0000 (11:44 +0200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge