Thomas Müller 6ff96b34ad Merge branch 'master' into load-apps-proper-master ... Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php		2014-03-21 14:05:08 +01:00
..
delete.php	Trashbin select all now doesn't send file list	2014-02-17 18:34:59 +01:00
isEmpty.php	added missing isEmpty ajax file	2013-07-30 12:48:41 +02:00
list.php	Merge branch 'master' into load-apps-proper-master	2014-03-21 14:05:08 +01:00
preview.php	Merge pull request #6726 from owncloud/fix_6630	2014-02-14 14:34:20 +01:00
undelete.php	Trashbin select all now doesn't send file list	2014-02-17 18:34:59 +01:00