Thomas Mueller 07b3b23a39 Merge branch 'master' into fixing-998-master ... Conflicts: apps/files/js/files.js		2013-01-06 22:28:21 +01:00
..
files	Merge branch 'master' into fixing-998-master	2013-01-06 22:28:21 +01:00
files_encryption	[tx-robot] updated from transifex	2012-12-31 00:05:31 +01:00
files_external	[tx-robot] updated from transifex	2013-01-03 00:05:19 +01:00
files_sharing	Merge pull request #1053 from owncloud/ocs_api	2013-01-04 17:18:58 -08:00
files_versions	[tx-robot] updated from transifex	2013-01-03 00:05:19 +01:00
user_ldap	[tx-robot] updated from transifex	2013-01-04 13:23:31 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-02 00:05:14 +01:00