Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01:00
..
helper.php	make it possible to select folders	2013-12-02 16:30:03 +01: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	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00