Thomas Müller 7425efade7 Merge branch 'master' into oc_preview ... Conflicts: 3rdparty lib/template.php		2013-07-30 00:34:36 +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	Merge branch 'master' into oc_preview	2013-07-30 00:34:36 +02:00