Merge branch 'MDL-58711-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jan 2018 09:55:23 +0000 (10:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jan 2018 09:55:23 +0000 (10:55 +0100)
1  2 
mod/assign/locallib.php

Simple merge