Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master ... Conflicts: apps/files/ajax/upload.php apps/files/js/files.js		2013-01-18 23:22:34 +01:00
..
files	Merge branch 'master' into fixing-998-master	2013-01-18 23:22:34 +01:00
files_encryption	Merge branch 'master' into fixing-unused-and-undefined-in-master	2013-01-14 23:41:34 +01:00
files_external	Whitespace cleanup	2013-01-16 18:09:16 +01:00
files_sharing	Whitespace cleanup	2013-01-16 18:09:16 +01:00
files_versions	Spaces to tabs	2013-01-16 18:09:16 +01:00
user_ldap	[tx-robot] updated from transifex	2013-01-18 00:04:36 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-18 00:04:36 +01:00