Jörn Friedrich Dreyer b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog ... Conflicts: apps/files/css/files.css apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files_sharing/js/public.js core/js/jquery.ocdialog.js core/js/oc-dialogs.js		2013-09-17 19:10:46 +02:00
..
files	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-17 19:10:46 +02:00
files_encryption	[tx-robot] updated from transifex	2013-09-16 11:38:45 -04:00
files_external	Merge pull request #4719 from owncloud/port_4701_master	2013-09-12 15:44:20 -07:00
files_sharing	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-17 19:10:46 +02:00
files_trashbin	Merge pull request #4501 from owncloud/ajaxfilelist	2013-09-14 12:51:16 -07:00
files_versions	[tx-robot] updated from transifex	2013-09-13 21:49:24 -04:00
user_ldap	[tx-robot] updated from transifex	2013-09-13 21:49:24 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-16 11:38:45 -04:00