Merge branch 'MDL-56318-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Nov 2016 09:55:09 +0000 (09:55 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Nov 2016 09:55:09 +0000 (09:55 +0000)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge