Merge branch 'MDL-58297-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 11 Apr 2017 02:49:07 +0000 (10:49 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 11 Apr 2017 02:49:07 +0000 (10:49 +0800)
1  2 
lib/filestorage/file_storage.php
lib/filestorage/stored_file.php
repository/lib.php

Simple merge
Simple merge
Simple merge