cakephp2-php8/lib/Cake/Routing
Jose Lorenzo Rodriguez d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
..
Filter avoid pass by reference error on 5.4 2012-09-24 18:26:25 +02:00
Route replacing is_integer() with is_int() 2012-09-15 11:15:01 +01:00
Dispatcher.php Use the returned response instance from the event 2012-07-31 18:39:05 +02:00
DispatcherFilter.php Fixing broken test and coding standard 2012-04-22 17:39:45 -04:30
Router.php Merge remote-tracking branch 'origin/master' into 2.3 2012-09-25 16:36:03 +02:00