diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-03-07 17:14:34 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-03-07 17:14:34 -0500 |
| commit | 48265643446f71abc1bf903ae822c746d5938865 (patch) | |
| tree | 8a66504c8dd0997a9cc8aa7631eea834667ee20a /lib/public | |
| parent | 4cb5cb9693a2b5d13905079f2ba7c6300c26d9b2 (diff) | |
| parent | 0aa6c1b163c582011f695510b0048e31479eb8a4 (diff) | |
| download | nextcloud-server-48265643446f71abc1bf903ae822c746d5938865.tar.gz nextcloud-server-48265643446f71abc1bf903ae822c746d5938865.zip | |
Merge branch 'master' into shared-folder-etags
Conflicts:
apps/files_sharing/lib/sharedstorage.php
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/share.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 57fcd936ac6..3e5af467d67 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -809,7 +809,7 @@ class Share { } else { $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, - `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`'; + `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`'; } } else { $select = '*'; |