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)
1  2 
mod/workshop/lib.php

Simple merge