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

diff --cc course/lib.php
Simple merge
Simple merge