Merge branch 'MDL-60153-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 08:18:23 +0000 (10:18 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 08:18:23 +0000 (10:18 +0200)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge