Merge branch 'MDL-56987-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:01:38 +0000 (18:01 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Nov 2016 18:01:38 +0000 (18:01 +0000)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge