Merge branch 'wip-MDL-55990-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 3 Oct 2016 05:00:08 +0000 (13:00 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 3 Oct 2016 05:00:08 +0000 (13:00 +0800)
1  2 
lib/db/upgrade.php

Simple merge