Michael Gapczynski b5989c933f Merge branch 'master' into shared-folder-etags ... Conflicts: apps/files_sharing/lib/sharedstorage.php		2013-02-28 10:39:23 -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	Style cleanup files_sharing	2013-02-21 23:46:50 +01:00
sharedstorage.php	Merge branch 'master' into shared-folder-etags	2013-02-28 10:39:23 -05:00
updater.php	Fix target path and reuse mtime	2013-02-26 01:43:04 -05:00
watcher.php	Actually add Shared_Watcher	2013-01-01 13:16:42 -05:00