Merge branch 'MDL-59696-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Sep 2017 22:44:10 +0000 (00:44 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:50:18 +0000 (10:50 +0200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge