Merge branch 'MDL-36941_master-fix' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 15:39:40 +0000 (17:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:42:18 +0000 (18:42 +0200)
commit83c64f78c0a2f4dcc1ddf1187d211d8441abbf33
treef554686793bc002ddef1a0ebd0dcbbe2a788f379
parent78c03392d4d6475221f802b35b13e21ea952cf1e
parent7489e4d5b9c0b44e03068586f3aa9545fdc4f5c9
Merge branch 'MDL-36941_master-fix' of git://github.com/markn86/moodle
iplookup/tests/geoip_test.php
lib/db/upgrade.php