mark_story 6d45953525 Merge branch '2.4' into 2.5 ... Conflicts: lib/Cake/VERSION.txt		2013-08-23 12:57:08 -04:00
..
Filter	Added missing calls to setUp & tearDown in tests	2013-07-29 01:52:39 +02:00
Route	RedirectRoute class does not honor persist as array with custom route elements.	2013-08-17 14:51:12 -04:00
DispatcherTest.php	Added missing calls to setUp & tearDown in tests	2013-07-29 01:52:39 +02:00
RouterTest.php	Accept 'connectOptions' in Router::mapResources()	2013-08-17 19:28:18 +07:00