Merge branch 'MDL-58179-master-fix' of https://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 22 Mar 2018 04:05:29 +0000 (12:05 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 22 Mar 2018 04:05:29 +0000 (12:05 +0800)
1  2 
mod/lesson/locallib.php

Simple merge