Merge branch 'MDL-57757-master' of git://github.com/jleyva/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 29 Mar 2017 10:51:46 +0000 (12:51 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 29 Mar 2017 10:51:46 +0000 (12:51 +0200)
1  2 
mod/lesson/classes/external.php
mod/lesson/report.php

Simple merge
Simple merge