Merge branch 'MDL-61714-master' of git://github.com/sarjona/moodle
authorDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 09:31:22 +0000 (11:31 +0200)
committerDavid Monllao <davidm@moodle.com>
Fri, 11 May 2018 09:31:22 +0000 (11:31 +0200)
1  2 
lib/db/upgrade.php

Simple merge