Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 17:59:55 +0000 (19:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 17:59:55 +0000 (19:59 +0200)
commit58c9faeaca7213fe284b7999fc77bff313d90582
tree32f06410c3312de4e63ebd9310d3467133151142
parent2b7a557c28a1fb13eb0a510855a570fad8f5aa95
parent4dab1c39e2612c0d49c2b4c314e45c09d90c30d0
Merge branch 'MDL-38661-m-wip' of git://github.com/andrewnicols/moodle

Conflicts:
theme/base/style/core.css
theme/bootstrapbase/style/moodle.css
theme/base/style/core.css
theme/base/style/course.css
theme/bootstrapbase/less/moodle/core.less
theme/bootstrapbase/less/moodle/course.less
theme/bootstrapbase/less/moodle/forms.less
theme/bootstrapbase/style/moodle.css
theme/formal_white/style/course.css
theme/magazine/style/core.css
theme/standard/style/course.css