Merge branch 'MDL-58123-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Mar 2017 19:45:55 +0000 (20:45 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:03:53 +0000 (18:03 +0000)
1  2 
mod/lesson/lib.php

Simple merge