Thomas Müller 6ff96b34ad Merge branch 'master' into load-apps-proper-master ... Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php		2014-03-21 14:05:08 +01:00
..
files	Merge branch 'master' into load-apps-proper-master	2014-03-21 14:05:08 +01:00
files_encryption	Merge pull request #7655 from owncloud/shared-unencryptedsize	2014-03-21 12:28:27 +01:00
files_external	Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords	2014-03-20 16:31:12 +01:00
files_sharing	[tx-robot] updated from transifex	2014-03-19 01:55:39 -04:00
files_trashbin	Merge branch 'master' into load-apps-proper-master	2014-03-21 14:05:08 +01:00
files_versions	[tx-robot] updated from transifex	2014-03-13 17:12:37 -04:00
user_ldap	Merge pull request #7823 from owncloud/fix_7796	2014-03-21 11:27:18 +01:00
user_webdavauth	[tx-robot] updated from transifex	2014-03-13 17:12:37 -04:00