Jörn Friedrich Dreyer 7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog ... Conflicts: apps/files/js/filelist.js		2013-09-19 17:00:54 +02:00
..
files	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
files_encryption	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_external	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_sharing	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_versions	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
user_ldap	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00