Merge branch 'MDL-57633-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Feb 2017 22:45:14 +0000 (23:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Feb 2017 22:45:14 +0000 (23:45 +0100)
1  2 
mod/lesson/locallib.php

Simple merge