Jörn Friedrich Dreyer 4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog ... Conflicts: apps/files/ajax/upload.php apps/files/js/file-upload.js apps/files/js/filelist.js apps/files/js/files.js apps/files/templates/part.list.php		2013-09-04 14:11:40 +02:00
..
files.css	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-04 14:11:40 +02:00