Merge branch 'MDL-59048' of https://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 14:43:28 +0000 (15:43 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Jun 2017 14:43:28 +0000 (15:43 +0100)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge