Merge branch 'MDL-42634-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 10:44:57 +0000 (11:44 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Aug 2015 10:44:57 +0000 (11:44 +0100)
commitedc3889618dc822053015bb1028ae36b5c2c97c9
tree25e276941517276756f5bda5eea29c81a41cb678
parent2394cf72d680f2bdc62562c8842c8b98c70d81fa
parentc855ced7bbf0359213e2768dd8892c1215e8502e
Merge branch 'MDL-42634-master' of git://github.com/andrewnicols/moodle
theme/base/style/blocks.css
theme/bootstrapbase/style/moodle.css