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

Simple merge