Merge branch 'MDL-61714-master' of git://github.com/sarjona/moodle
commit4033c2a11b61c15705f4c1dbb1ed9002f1a19645
authorDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:10:29 +0000 (10 18:10 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:10:29 +0000 (10 18:10 +0200)
tree3e8f7f749a3776d755b3314dc82fc97a57888b03
parent74e82e468439d9d9aa121175aca6d7c32cee901c
parentb1f1bd2e542a617b8c8a8781e0344c25fc9a70d1
Merge branch 'MDL-61714-master' of git://github.com/sarjona/moodle
lib/db/upgrade.php
version.php