Bart Visscher 66b1ad0a9b Merge branch 'master' into type-hinting-sharing ... Conflicts: apps/files_sharing/lib/share/file.php apps/files_sharing/tests/api.php lib/private/share/share.php		2014-04-28 17:59:41 +02:00
..
constants.php	add some action items	2014-04-23 12:54:24 +02:00
helper.php	add setting to set default expire date	2014-04-24 13:34:31 +02:00
hooks.php	add a "helper" and a "hooks" class. Move constants needed by multiple classes	2014-03-25 17:47:24 +01:00
mailnotifications.php	Merge branch 'master' into type-hinting	2014-03-31 21:38:54 +02:00
searchresultsorter.php	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
share.php	Merge branch 'master' into type-hinting-sharing	2014-04-28 17:59:41 +02:00