Michael Gapczynski 4826564344 Merge branch 'master' into shared-folder-etags ... Conflicts: apps/files_sharing/lib/sharedstorage.php		2013-03-07 17:14:34 -05:00
..
files	Merge pull request #2167 from owncloud/input-type-fix	2013-03-07 07:28:22 -08:00
files_encryption	[tx-robot] updated from transifex	2013-03-07 00:16:59 +01:00
files_external	[tx-robot] updated from transifex	2013-03-07 00:16:59 +01:00
files_sharing	Merge branch 'master' into shared-folder-etags	2013-03-07 17:14:34 -05:00
files_trashbin	add dirlisting var to file list	2013-03-07 14:54:59 +01:00
files_versions	[tx-robot] updated from transifex	2013-03-06 00:08:33 +01:00
user_ldap	[tx-robot] updated from transifex	2013-03-07 00:16:59 +01:00
user_webdavauth	Merge pull request #2030 from j-ed/master	2013-03-04 12:59:39 -08:00