Merge branch 'MDL-52615_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jan 2016 23:29:26 +0000 (00:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jan 2016 23:29:26 +0000 (00:29 +0100)
1  2 
mod/workshop/styles.css

Simple merge