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
..
files	[tx-robot] updated from transifex	2013-03-06 00:08:33 +01:00
files_encryption	Merge pull request #2030 from j-ed/master	2013-03-04 12:59:39 -08:00
files_external	[tx-robot] updated from transifex	2013-03-06 00:08:33 +01:00
files_sharing	Merge branch 'master' into shared-folder-etags	2013-03-05 21:54:32 -05:00
files_trashbin	Merge pull request #2090 from owncloud/fixing-2089-master	2013-03-04 13:17:35 -08: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-06 00:08:33 +01:00
user_webdavauth	Merge pull request #2030 from j-ed/master	2013-03-04 12:59:39 -08:00