Merge branch 'MDL-42849-master' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 13 Nov 2013 07:24:06 +0000 (18:24 +1100)
committerMarina Glancy <marina@moodle.com>
Wed, 13 Nov 2013 07:24:06 +0000 (18:24 +1100)
commit4c35937514a1bf0b8d234c1626cfaf7b86c77d22
treeed0ed7ca81e1bf8072cb759464f158d783544e84
parentb22292ed50bef899fe0703a3bdb441609d7ddade
parent83f91454f9035aa54002bd2c83a30398de5ecb15
Merge branch 'MDL-42849-master' of git://github.com/andrewnicols/moodle
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css