Merge branch 'MDL-57664_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 20 Mar 2017 10:20:22 +0000 (11:20 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 20 Mar 2017 10:20:22 +0000 (11:20 +0100)
1  2 
mod/lesson/renderer.php

Simple merge