Merge branch 'MDL-54934-master' of https://github.com/nashtechdev01/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:44:14 +0000 (20:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:44:14 +0000 (20:44 +0200)
1  2 
mod/workshop/renderer.php

Simple merge