server/tests/lib/appframework
Thomas Müller fdeef5e874 Merge branch 'master' into fixing-appframework-master
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +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 OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller 2013-10-11 10:07:57 +02:00
middleware Merge branch 'master' into fixing-appframework-master 2013-10-16 15:45:55 +02:00
routing kill superfluent classloader from tests - this approach might be of interest within the apps 2013-08-21 00:41:20 +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