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
..
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-04 14:11:40 +02:00
l10n	[tx-robot] updated from transifex	2013-09-03 07:46:55 -04:00
lib	backport of #4357 to master	2013-08-27 23:53:04 +02:00
templates	Merge master into oc_preview	2013-08-19 11:24:17 +02:00
public.php	move isMimeSupported out of template files	2013-08-21 15:55:59 +02:00