Merge branch 'share_api'
authorMichael Gapczynski <mtgap@owncloud.com>
Mon, 20 Aug 2012 02:29:01 +0000 (22:29 -0400)
committerMichael Gapczynski <mtgap@owncloud.com>
Mon, 20 Aug 2012 02:29:01 +0000 (22:29 -0400)
commit82d81e8d39ce69211ec6b29fe3f803c57714b8dd
tree09dbd675480a02fd626f6634e083f3d6a01b4404
parentf893d21660695d1d1cd594c102e2bcba6919dee3
parent5eca531f99f9615d1a09bbb0b03dda2063901aa7
Merge branch 'share_api'

Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
apps/contacts/lib/vcard.php
apps/files/index.php
apps/files_archive/lib/storage.php
core/js/share.js
lib/files.php
lib/filestorage.php
lib/filestorage/common.php
lib/filestorage/local.php
lib/filesystem.php
lib/filesystemview.php
tests/lib/filestorage.php