Merge branch 'MDL-54544-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 05:55:05 +0000 (13:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 05:55:05 +0000 (13:55 +0800)
commit50c338b84b41ed57645f08518d8fb092eeaea8c0
treea141a30b5e125b1092365d19924ea61f5e34e0fc
parent61e1d3d96c347b62b260c4267558111c3dc0a752
parent4f54bdc733f95b6efefce72ed04a4b64d960dd57
Merge branch 'MDL-54544-master' of git://github.com/damyon/moodle
lib/filestorage/file_storage.php