Merge branch 'MDL-39261-master' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Fri, 12 Apr 2019 02:52:16 +0000 (10:52 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Fri, 12 Apr 2019 02:52:16 +0000 (10:52 +0800)
1  2 
mod/lesson/essay.php
mod/lesson/lang/en/lesson.php
mod/lesson/locallib.php

Simple merge
Simple merge
Simple merge