Merge branch 'MDL-51580' of git://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 21:03:28 +0000 (05:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Feb 2016 21:03:28 +0000 (05:03 +0800)
1  2 
lib/upgrade.txt
mod/lesson/db/upgrade.php

diff --cc lib/upgrade.txt
Simple merge
Simple merge