Merge branch 'wip-MDL-51985-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Dec 2015 02:08:18 +0000 (03:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 10:16:34 +0000 (11:16 +0100)
1  2 
lib/filestorage/file_storage.php

Simple merge