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
..
core	removing log(), getTemplate(), getLocalFilePath(), getUrlContent(), getFileInfo()	2013-10-07 11:41:28 +02:00
dependencyinjection	Merge branch 'master' into fixing-appframework-master	2013-10-16 15:45:55 +02:00
http	OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller	2013-10-11 10:07:57 +02:00
middleware	Merge pull request #5067 from owncloud/urlParams_fix	2013-10-16 06:42:09 -07:00
routing	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
utility	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
app.php	Get urlParams registered before Request is instantiated	2013-10-01 19:03:34 +02:00