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
..
ajax	outsource sharing and deleted files previews to apps	2013-08-19 13:24:07 +02:00
appinfo	outsource sharing and deleted files previews to apps	2013-08-19 13:24:07 +02:00
css	Use default cursor for list items	2013-07-30 20:58:21 +03:00
js	Merge branch 'master' into fix_3728_with_file_exists_dialog	2013-09-17 19:10:46 +02:00
l10n	[tx-robot] updated from transifex	2013-09-13 21:49:24 -04:00
lib	more is_resource checks before readdir	2013-09-05 11:58:57 +02:00
templates	Merge master into oc_preview	2013-08-19 11:24:17 +02:00
public.php	Ajax calls for "files" and "files_trashbin" apps	2013-09-13 19:59:14 +02:00