Merge branch 'wip-MDL-60161-34' of git://github.com/abgreeve/moodle into MOODLE_34_STABLE
commitfb7b0157c1c36aedf12a99b45918f8e6af939d45
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 15:11:47 +0000 (18 16:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 15:11:47 +0000 (18 16:11 +0100)
tree9cef7ec92e66476e3472e0140d73758d16d42581
parentb85ec901dd380707246faec2d1851b21fcace4c4
parent54339683ac0fe8effa6f0768a597dde31f401e14
Merge branch 'wip-MDL-60161-34' of git://github.com/abgreeve/moodle into MOODLE_34_STABLE
lib/filelib.php
lib/tests/filelib_test.php