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
..
ajax	Merge branch 'master' into load-apps-proper-master	2014-03-21 14:05:08 +01:00
appinfo	get trash size from file cache	2014-03-10 15:13:28 +01:00
css	make it possible to select folders	2013-12-02 16:30:03 +01:00
js	Fixed trashbin title	2014-02-20 15:16:45 +01:00
l10n	[tx-robot] updated from transifex	2014-03-13 17:12:37 -04:00
lib	Improve sorting performance of large lists of files	2014-03-19 13:53:59 +01:00
templates	always show 'Deleted Files' breadcrumb	2013-12-13 12:17:10 +01:00
index.php	if file is not in db, fall back to restore file to the users root	2014-03-10 15:13:28 +01:00