Merge branch 'wip-MDL-59287-master-v3' of git://github.com/abgreeve/moodle
commit58a9d391a602f00f69c6e5dd9b39bb3d92524739
authorDan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 10:29:53 +0000 (11 11:29 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 10:29:53 +0000 (11 11:29 +0100)
treed99787de5ee96db8bcf2204204608b30b76aaf78
parentf9384568352a4d5195ab3436484ce10c20e41472
parent9ffbdafc95cad23ebbee6f1d9c93e99fd2103c6b
Merge branch 'wip-MDL-59287-master-v3' of git://github.com/abgreeve/moodle
course/lib.php
mod/workshop/lib.php