Merge branch 'MDL-50812-master' of https://github.com/nashtechdev01/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 5 Jun 2018 09:51:09 +0000 (11:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:13 +0000 (11:16 +0200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge