mark_story 2afb05b590 Merge branch '2.0' into 2.1 ... Conflicts: app/View/Pages/home.ctp lib/Cake/Config/config.php lib/Cake/Core/App.php lib/Cake/VERSION.txt lib/Cake/View/Helper/NumberHelper.php		2012-02-12 10:06:13 -05:00
..
Helper	Merge branch '2.0' into 2.1	2012-02-12 10:06:13 -05:00
HelperCollectionTest.php	Consistently setting setUp() and tearDown() on test cases	2011-12-04 13:27:51 -08:00
HelperTest.php	Merge pull request #421 from tigrang/plugin-assets	2012-02-08 17:31:44 -08:00
JsonViewTest.php	Change serialize to _serialize	2011-11-27 23:51:49 -05:00
MediaViewTest.php	Made specifying 'extension' optional. Fixed bug where downloaded file did not have extension when 'name' was specified. Fixes #2554	2012-02-08 01:08:04 +05:30
ScaffoldViewTest.php	Updating test to reflect last changes made by pull #413.	2012-01-16 16:51:49 +01:00
ThemeViewTest.php	Avoiding class name conflicts	2012-01-22 16:46:41 -04:30
ViewTest.php	Fix Cache::clear() calls in tests.	2012-02-10 20:38:41 +01:00
XmlViewTest.php	Change serialize to _serialize	2011-11-27 23:51:49 -05:00