Merge branch 'MDL-54833-master-workshopuserplan' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2016 18:46:30 +0000 (20:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Oct 2016 18:46:30 +0000 (20:46 +0200)
commit717845b52d3b50791c1d17c585c6ed5eda747dd0
treefdea1fa998a6bb33417e3dec764e45f2dcda59f1
parent0d80f6984b5b41dc4932cfd409bce391fcb7f10b
parent5b1a074d8958d2a736f26a56a8d54b72d100d0c3
Merge branch 'MDL-54833-master-workshopuserplan' of git://github.com/mudrd8mz/moodle