Merge branch 'MDL-60320' of git://github.com/aolley/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:05:54 +0000 (00:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:05:54 +0000 (00:05 +0200)
1  2 
lib/filelib.php

diff --cc lib/filelib.php
Simple merge