cakephp2-php8/lib/Cake/Test/Case/Routing
mark_story 27d7e2865e Merge branch 'master' into 2.3
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
..
Filter fix failing testcase 2012-05-03 10:13:18 +02:00
Route Add missing urlencoding to nested named parameters. 2012-07-02 23:34:53 -04:00
DispatcherTest.php fix remaining cs errors 2012-11-04 13:56:13 +01:00
RouterTest.php Merge branch 'master' into 2.3 2012-11-20 23:02:33 -05:00