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
..
hooks.php	Whitespace fixes	2013-02-22 19:05:36 +01:00
trash.php	Merge branch 'master' into update-expire-function	2013-02-25 14:26:59 +01:00