Jörn Friedrich Dreyer cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog ... Conflicts: apps/files/js/file-upload.js		2013-09-10 16:54:48 +02:00
..
files	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-10 16:54:48 +02:00
files_encryption	[tx-robot] updated from transifex	2013-09-10 10:42:16 -04:00
files_external	removing all ?> jutt in case	2013-09-10 11:25:40 +02:00
files_sharing	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-10 16:54:48 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-09-10 10:42:16 -04:00
files_versions	[tx-robot] updated from transifex	2013-09-10 10:42:16 -04:00
user_ldap	[tx-robot] updated from transifex	2013-09-10 10:42:16 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-10 10:42:16 -04:00