Thomas Mueller 364b1cd391 Merge branch 'master' into fixing-998-master ... Conflicts: apps/files/js/files.js		2013-01-11 10:00:12 +01:00
..
files	Merge branch 'master' into fixing-998-master	2013-01-11 10:00:12 +01:00
files_encryption	[tx-robot] updated from transifex	2013-01-11 00:06:14 +01:00
files_external	[tx-robot] updated from transifex	2013-01-11 00:06:14 +01:00
files_sharing	Merge pull request #1133 from owncloud/add_linebreaks_in_sharing	2013-01-10 15:14:14 -08:00
files_versions	[tx-robot] updated from transifex	2013-01-11 00:06:14 +01:00
user_ldap	[tx-robot] updated from transifex	2013-01-11 00:06:14 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-11 00:06:14 +01:00