Merge branch 'MDL-57724-master' of git://github.com/jleyva/moodle
authorDavid Monllao <david.monllao@gmail.com>
Thu, 23 Mar 2017 11:47:19 +0000 (12:47 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Thu, 23 Mar 2017 11:47:19 +0000 (12:47 +0100)
1  2 
mod/lesson/locallib.php

Simple merge