Merge branch 'wip-MDL-59363-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Tue, 11 Jul 2017 10:36:58 +0000 (12:36 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Tue, 11 Jul 2017 10:36:58 +0000 (12:36 +0200)
commite78d7cc0b1f94d2725a89d9aaa5a401c38147e66
treea9490bf762ce76465fa6714ed551c0d50e7f1ff1
parente5ca70ba1d31fac025639143f23b232e43dac03f
parent6023e58bd14fdb076e50be5f65646fc31b40790e
Merge branch 'wip-MDL-59363-master' of git://github.com/marinaglancy/moodle
mod/workshop/lib.php