Björn Schießle 99c62dfd76 Merge branch 'master' into fix_glob_escaping ... Conflicts: apps/files_trashbin/lib/trash.php		2013-06-17 14:51:08 +02:00
..
hooks.php	cleanup the trash bin tables in the database after a user was deleted	2013-04-11 14:40:06 +02:00
trash.php	Merge branch 'master' into fix_glob_escaping	2013-06-17 14:51:08 +02:00