Björn Schießle 4dea6a6228 Merge branch 'master' into trashbin_encryption ... Conflicts: apps/files_trashbin/index.php apps/files_trashbin/lib/trash.php		2013-02-25 12:14:51 +01:00
..
app.php	Whitespace fixes	2013-02-22 19:05:36 +01:00
database.xml	first version of the trash bin app	2013-01-22 15:33:53 +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	update script which copies all trash bin related files to user/files_trashbin	2013-02-20 19:18:34 +01:00