Merge branch 'MDL-57724-master' of git://github.com/jleyva/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 22 Mar 2017 20:20:03 +0000 (21:20 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 22 Mar 2017 20:20:03 +0000 (21:20 +0100)
1  2 
mod/lesson/classes/external.php
mod/lesson/locallib.php
mod/lesson/renderer.php

Simple merge
Simple merge
Simple merge