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
..
public.js	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-17 19:10:46 +02:00
share.js	Ajax calls for "files" and "files_trashbin" apps	2013-09-13 19:59:14 +02:00