mark_story a7a6fcae8a Merge branch 'master' into 2.5 ... Conflicts: lib/Cake/VERSION.txt		2013-09-17 10:11:24 -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	cs corrections, bool to boolean and int to integer.	2013-09-17 14:44:34 +02:00
RouterTest.php	Accept 'connectOptions' in Router::mapResources()	2013-08-17 19:28:18 +07:00