Merge branch 'MDL-66304' of https://github.com/golenkovm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Oct 2019 08:53:24 +0000 (10:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Oct 2019 08:53:24 +0000 (10:53 +0200)
1  2 
lib/filelib.php
lib/upgrade.txt

diff --cc lib/filelib.php
Simple merge
diff --cc lib/upgrade.txt
Simple merge