Merge branch 'MDL-56948-master' of https://github.com/lucisgit/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 15:58:05 +0000 (15:58 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 15:58:05 +0000 (15:58 +0000)
1  2 
mod/assign/locallib.php

Simple merge