Permalink
Browse files

Merge branch '1.2' of dev@code.cakephp.org:cakephp into 1.2

  • Loading branch information...
markstory committed Sep 24, 2009
2 parents 6946bb0 + cd64043 commit 4530e706a49aefa4b12057ad550b451c90919a15
Showing with 1 addition and 0 deletions.
  1. +1 −0 cake/libs/controller/components/email.php
@@ -206,6 +206,7 @@ class EmailComponent extends Object{
* - timeout * - timeout
* - username * - username
* - password * - password
* - client
* *
* @var array * @var array
* @access public * @access public

0 comments on commit 4530e70

Please sign in to comment.