Merge branch 'MDL-42782-master' of git://github.com/jethac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 23:08:45 +0000 (01:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 23:08:45 +0000 (01:08 +0200)
commit2975f1a0cc72b0556205dc14a03d9caf89f4da61
tree8ba9d9044a5cf22a2350fec28c24317a3722cae2
parent0a87b6809f60a3d678d6f0527f51c08d8d80c1c6
parentbd77886b41610e464de24c604a61022a2c1ce1a7
Merge branch 'MDL-42782-master' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
theme/base/style/core.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/style/moodle.css