Merge branch 'MDL-54832-master' of https://github.com/nashtechdev01/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 04:47:13 +0000 (06:47 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 04:47:13 +0000 (06:47 +0200)
commit1d17f51a8df2f7570c9b2fec95593b7c299139e5
tree1d9de747c7b4dad5eedf17250867453f36a6cf51
parent5a1728df39116fc701cc907e85a638aa7674f416
parente9bf00fb1406f25b3bf62cfd259825901cf8e657
Merge branch 'MDL-54832-master' of https://github.com/nashtechdev01/moodle
mod/workshop/lang/en/workshop.php
mod/workshop/renderer.php