Merge branch 'wip-MDL-58697-master-assigngrading' of git://github.com/adamann2/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 13:53:37 +0000 (15:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 13:53:37 +0000 (15:53 +0200)

Trivial merge