Merge branch 'MDL-59244-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:36:56 +0000 (01:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:36:56 +0000 (01:36 +0200)
1  2 
mod/workshop/classes/external.php
mod/workshop/tests/external_test.php

Simple merge
Simple merge