Merge branch 'MDL-67593-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Dec 2019 09:45:11 +0000 (10:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Dec 2019 09:45:11 +0000 (10:45 +0100)
commitcba5cccebd3a02ce89edaa148233de0bb3ac079d
tree25ce1f9ca6a047bd0a9cc946ead31c92f4659882
parent53384db8224606b213643f437641efcfe0efe16c
parentdbf29da73f460918a00f39d7b163d0fda83e765a
Merge branch 'MDL-67593-master' of https://github.com/snake/moodle
lang/en/admin.php
lib/maxmind/readme_moodle.txt