Merge branch 'MDL-58983-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Dec 2017 13:00:48 +0000 (14:00 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:56 +0000 (17:54 +0100)
1  2 
mod/assign/locallib.php
mod/assign/renderer.php

Simple merge
Simple merge