mark_story 60f9626838 Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Test/Case/View/MediaViewTest.php		2012-11-02 16:52:51 -04:00
..
Database	Merge branch 'master' into 2.3	2012-11-02 16:52:51 -04:00
Session	Allow 1 second of slip.	2012-07-18 22:22:57 -04:00
CakeSessionTest.php	check() for CookieComponent and Configure (similar to CakeSession::check())	2012-09-04 01:04:48 +02:00
DataSourceTest.php	Remove trailing whitespace from comments	2012-10-15 18:19:37 -06:00
DboSourceTest.php	Use correct value when using virtualFields in conditions and IN (), refs PR#897	2012-11-02 14:29:38 +01:00