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)
commit84fb93a77e975b234e98cd5079a2e8c67a8101fe
tree30f540475d91347a38a1ca0c08dc04633f16aec3
parentf669ad5ca75b15770c6582b44debce800a136b31
parente6a47804523bf0cfb5258caf835519966b91453c
Merge branch 'MDL-58297-master' of git://github.com/andrewnicols/moodle
lib/filestorage/file_storage.php
lib/filestorage/stored_file.php
repository/lib.php