Merge branch 'MDL-59702' of https://github.com/andrewhancox/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Aug 2017 03:01:30 +0000 (11:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Aug 2017 03:01:30 +0000 (11:01 +0800)
1  2 
mod/lesson/locallib.php

Simple merge