Merge branch 'MDL-51097_m31v1' of https://github.com/sbourget/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Dec 2015 10:34:44 +0000 (10:34 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Dec 2015 10:34:44 +0000 (10:34 +0000)
1  2 
mod/lesson/view.php

Simple merge