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
..
app.php	Correct parent folders' ETags for all users with access to a shared file	2013-02-26 01:21:48 -05:00
info.xml	Set required owncloud version to 4.93	2013-02-24 17:38:36 +01:00
update.php	Style cleanup files_sharing	2013-02-21 23:46:50 +01:00
version	Remove old Shared folders from the file cache, fixes bug oc-1911	2012-10-07 17:34:21 -04:00