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)
commitb9103d358dee4b9e4c0f6301b7b4b1426ca98d8c
treee17ed5e173df5262743c294251ed4fbf30be2073
parent0f97fc6c3f7df5bfb5bf4fb23e6ae5f089f7b9e0
parent22e97be3189fb32668ddeb1a316c7eea63b9846c
Merge branch 'MDL-52615_master' of https://github.com/nadavkav/moodle
mod/workshop/styles.css