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.css	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-19 17:00:54 +02:00
upload.css	move upload dialog css to separate file	2013-09-18 17:20:14 +02:00