diff options
| author | Jakob Sack <kde@jakobsack.de> | 2011-07-29 20:42:24 +0200 |
|---|---|---|
| committer | Jakob Sack <kde@jakobsack.de> | 2011-07-29 20:42:24 +0200 |
| commit | 2bfad189e7e9c8ea78e4b5f78c9e779074dd991c (patch) | |
| tree | 697204517c95647e382a4723545ade3950420913 /lib/filestorage.php | |
| parent | e69079f9354464d21f31ae8b6d9e47988ba22fb4 (diff) | |
| parent | d12d08e2f3553b06df6371535f971c9f193bd388 (diff) | |
| download | nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.tar.gz nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.zip | |
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
lib/base.php
lib/filestorage.php
Diffstat (limited to 'lib/filestorage.php')
| -rw-r--r-- | lib/filestorage.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/filestorage.php b/lib/filestorage.php index ada85f1a50d..ba1a4b295aa 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -58,5 +58,3 @@ class OC_FILESTORAGE{ public function search($query){} public function getLocalFile($path){}// get a path to a local version of the file, whether the original file is local or remote } - -?>
\ No newline at end of file |