mark_story c9bd97309f Merge branch '1.3' into merger ... Conflicts: cake/libs/configure.php cake/libs/controller/components/email.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/controller/components/email.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php lib/Cake/Config/config.php lib/Cake/Console/Command/Task/ViewTask.php lib/Cake/Model/Datasource/DboSource.php lib/Cake/Model/Model.php lib/Cake/Test/Case/Model/ModelReadTest.php lib/Cake/Test/Case/Model/ModelValidationTest.php lib/Cake/Test/Case/Utility/InflectorTest.php lib/Cake/Test/Case/View/Helper/FormHelperTest.php lib/Cake/Utility/Inflector.php lib/Cake/Utility/Validation.php lib/Cake/VERSION.txt lib/Cake/View/Helper.php lib/Cake/View/Helper/FormHelper.php		2011-10-01 22:38:20 -04:00
..
ClassRegistryTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
DebuggerTest.php	Making test more generic so it passes on Jenkins.	2011-09-30 22:44:04 -04:00
FileTest.php	Update expectation to account for umask()	2011-09-30 22:10:16 -04:00
FolderTest.php	Redoing fix done in 155968349f	2011-09-22 22:05:36 -04:00
InflectorTest.php	Merge branch '1.3' into merger	2011-10-01 22:38:20 -04:00
ObjectCollectionTest.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
SanitizeTest.php	Merge branch '2.0' into 2.0-api-doc	2011-08-14 21:12:05 -04:00
SecurityTest.php	Refactoring expectError() calls to PHPUnit annotations	2011-09-13 19:56:37 +01:00
SetTest.php	Merge branch '2.0' into 2.0-api-doc	2011-08-14 21:12:05 -04:00
StringTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
ValidationTest.php	Merge branch '1.3' into merger	2011-10-01 22:38:20 -04:00
XmlTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00