Merge branch 'MDL-55915_master' of https://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2017 21:03:48 +0000 (22:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2017 21:03:48 +0000 (22:03 +0100)
1  2 
grade/report/grader/lib.php
mod/assign/renderer.php

Simple merge
Simple merge