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
..
base.php	Merge branch 'master' into type-hinting	2014-03-31 21:38:54 +02:00
cssresourcelocator.php	enable static delivery of css files	2014-02-20 13:27:46 +01:00
functions.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
jsresourcelocator.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
resourcelocator.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
templatefilelocator.php	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00