Merge branch 'm29_MDL-48317' of https://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 17:30:27 +0000 (17:30 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:37:53 +0000 (11:37 +0000)
1  2 
theme/bootstrapbase/style/moodle.css

Simple merge