Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 14:49:58 +0000 (15:49 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 14:49:58 +0000 (15:49 +0100)
commit66689366a0589aea5b0cd1199bbdfd0db12177bf
treeb1f3ab1595bbc3dc9ca70ef17a452639babd89b9
parentda88accb5f2c8af2a87388ec5ca865589c008928
parent9f1088d48298edef7db464802746f7b0ffef0b39
Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css
grade/lib.php
lang/en/grades.php
lib/grade/grade_category.php
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css