Michael Gapczynski 4dcbaa1d7b Merge branch 'master' into shared-folder-etags ... Conflicts: apps/files_sharing/appinfo/app.php		2013-03-05 21:54:32 -05:00
..
share	Merge branch 'master' into shared-folder-etags	2013-02-28 10:39:23 -05:00
cache.php	Merge branch 'master' into shared-folder-etags	2013-02-28 10:39:23 -05:00
permissions.php	Change remove() $user parameter to optional	2013-03-04 11:44:09 -05:00
sharedstorage.php	Update ETag when file is shared	2013-03-02 12:57:29 -05:00
updater.php	Fix variable name in Shared_Updater	2013-03-02 13:11:57 -05:00
watcher.php	Actually add Shared_Watcher	2013-01-01 13:16:42 -05:00