diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
| commit | 31e723a907399d7d33a0699da082164055f79b3e (patch) | |
| tree | 7da079cc3db0a46512da1b02cc19307337d9ce54 /lib/fileproxy.php | |
| parent | c7b1bdf00e65cca2a42d77fc5f27d0ea69e53be3 (diff) | |
| parent | 209d599ec5b00c5b92a33e902867fc621e725c93 (diff) | |
| download | nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.tar.gz nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.zip | |
Merge github.com:owncloud/core
Conflicts:
lib/public/share.php
Diffstat (limited to 'lib/fileproxy.php')
| -rw-r--r-- | lib/fileproxy.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fileproxy.php b/lib/fileproxy.php index 2f81bde64a1..52ec79b4bdb 100644 --- a/lib/fileproxy.php +++ b/lib/fileproxy.php @@ -36,7 +36,7 @@ * The return value of the post-proxy will be used as the new result of the operation * The operations that have a post-proxy are: * file_get_contents, is_file, is_dir, file_exists, stat, is_readable, - * is_writable, fileatime, filemtime, filectime, file_get_contents, + * is_writable, filemtime, filectime, file_get_contents, * getMimeType, hash, fopen, free_space and search */ |