Merge branch 'MDL-42818-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 09:31:24 +0000 (11:31 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 09:31:24 +0000 (11:31 +0200)
1  2 
mod/assign/gradingtable.php
mod/assign/lang/en/assign.php

Simple merge
Simple merge