Merge branch 'MDL-52999-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 02:43:12 +0000 (10:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Mar 2016 02:43:12 +0000 (10:43 +0800)
commitd76acc87f765fe76ec7b8b6f1be710faf2d2da61
tree24162036ce01022b293c8868205bcef7f633b22c
parent57ecaf68b8ebe608633883ba6cb03f1c43f2e29e
parent7cc2106193eeb35c91e53066e2dd1ce97d40f082
Merge branch 'MDL-52999-master' of git://github.com/jleyva/moodle
mod/assign/feedback/comments/locallib.php
mod/assign/feedback/file/locallib.php
mod/assign/tests/externallib_test.php