cakephp2-php8/lib/Cake/Network/Email
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
..
AbstractTransport.php Merge remote-tracking branch 'ceeram/2.0-email' into 2.0 2011-08-31 17:39:41 -04:30
CakeEmail.php Merge branch '1.3' into merger 2011-10-01 22:38:20 -04:00
DebugTransport.php Merge remote-tracking branch 'ceeram/2.0-email' into 2.0 2011-08-31 17:39:41 -04:30
MailTransport.php fixing duplicate emails being sent with MailTransport fixes #2022 2011-09-29 15:00:48 +02:00
SmtpTransport.php Merge remote-tracking branch 'ceeram/2.0-email' into 2.0 2011-08-31 17:39:41 -04:30