Thomas Müller db39fede97 Merge branch 'master' into appframework-master ... Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php		2013-09-25 09:52:12 +02:00
..
helper.php	Merge branch 'master' into appframework-master	2013-09-25 09:52:12 +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
trashbin.php	namespaces use upcasefirst parts	2013-09-20 16:37:07 +02:00