Merge branch 'MDL-46092' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 21 Apr 2016 12:21:03 +0000 (13:21 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 21 Apr 2016 12:21:03 +0000 (13:21 +0100)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge