Merge branch 'MDL-56652-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 14:37:00 +0000 (14:37 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 14:37:00 +0000 (14:37 +0000)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge