Merge branch 'MDL-37832-M30' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 09:14:11 +0000 (10:14 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Jul 2015 09:14:11 +0000 (10:14 +0100)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge