Merge branch 'MDL-60685-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 22:23:10 +0000 (00:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 22:23:10 +0000 (00:23 +0200)
1  2 
mod/assign/locallib.php
mod/assign/tests/locallib_test.php

Simple merge
Simple merge