Björn Schießle 4c980a4851 Merge branch 'master' into update-expire-function ... Conflicts: apps/files_trashbin/appinfo/version apps/files_trashbin/lib/trash.php		2013-02-25 14:26:59 +01:00
..
app.php	Whitespace fixes	2013-02-22 19:05:36 +01:00
database.xml	use the same string lengths like the file cache	2013-02-22 10:05:08 +01:00
info.xml	rename app to 'deleted files'	2013-02-21 16:34:22 +01:00
update.php	update script which copies all trash bin related files to user/files_trashbin	2013-02-20 19:18:34 +01:00
version	calculate trashbin size per user	2013-02-21 12:37:13 +01:00