Merge branch 'wip-MDL-60161-master-test' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 15:09:51 +0000 (16:09 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 15:09:51 +0000 (16:09 +0100)
1  2 
lib/filelib.php
lib/tests/filelib_test.php

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