Bart Visscher 6b061c236d Merge branch 'master' into type-hinting ... Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php		2014-03-31 21:38:54 +02:00
..
constants.php	add a "helper" and a "hooks" class. Move constants needed by multiple classes	2014-03-25 17:47:24 +01:00
helper.php	add a "helper" and a "hooks" class. Move constants needed by multiple classes	2014-03-25 17:47:24 +01: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	Emit event after setting a new expiration for a share	2014-03-28 15:00:13 +01:00