Georg Ehrke af983b843d fix merge conflicts		2013-08-05 14:27:38 +02:00
..
hooks.php	expire trash bin if trash bin exceeds max size after a new file was added to ownCloud	2013-07-26 11:45:38 +02:00
trash.php	fix merge conflicts	2013-08-05 14:27:38 +02:00