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
..
controller	OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller	2013-10-11 10:07:57 +02:00
dependencyinjection	remove getTrans() from API class	2013-10-07 11:36:38 +02:00
http	use assertSame and assertNotSame for etag checks	2014-02-27 09:39:34 +01:00
middleware	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
routing	Merge branch 'master' into type-hinting	2014-03-31 21:38:54 +02:00
utility	kill superfluent classloader from tests - this approach might be of interest within the apps	2013-08-21 00:41:20 +02:00
AppTest.php	Merge branch 'master' into fixing-appframework-master	2013-10-16 15:45:55 +02:00