Thomas Müller 7279a07ca2 Merge branch 'master' into mimetype-defaults ... Conflicts: apps/files/ajax/newfile.php		2013-08-16 00:13:10 +02:00
..
files	Merge branch 'master' into mimetype-defaults	2013-08-16 00:13:10 +02:00
files_encryption	[tx-robot] updated from transifex	2013-08-15 04:53:54 -04:00
files_external	Merge pull request #4302 from synchrone/master	2013-08-14 17:11:30 -07:00
files_sharing	Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox	2013-08-15 14:08:01 -07:00
files_trashbin	fixing all broken translation files	2013-08-15 15:41:45 +02:00
files_versions	[tx-robot] updated from transifex	2013-08-13 09:13:11 -04:00
user_ldap	[tx-robot] updated from transifex	2013-08-13 09:13:11 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-08-13 09:13:11 -04:00