cakephp2-php8/lib/Cake/Routing
mark_story 6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
..
Route Merge branch '2.0' into 2.1 2011-12-03 13:45:28 -05:00
Dispatcher.php Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
Router.php removing unused variable, fixes #2227 2011-11-07 09:19:01 +01:00