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