Merge branch 'MDL-58498-master' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 06:44:56 +0000 (07:44 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 20 Apr 2017 06:44:56 +0000 (07:44 +0100)
1  2 
mod/lesson/lib.php
mod/lesson/tests/lib_test.php

Simple merge
Simple merge