Merge branch 'MDL-59238-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 08:52:03 +0000 (09:52 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Jul 2017 08:52:03 +0000 (09:52 +0100)
commit69340d49dc9e633aef7b290b7e41de06e2499a18
tree977b26cbbba3a9d62e53dcc5e17517cb1274a11c
parenta13277a74032eed40ea9bc9cef5d671e028a13a3
parent291645f7605668e5257b6a37e1ebf63c9ba6d8af
Merge branch 'MDL-59238-master' of git://github.com/jleyva/moodle
mod/workshop/locallib.php