Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2012-08-29 11:05:14 -04:00 · 2012-08-29 11:05:14 -04:00 · 8b5f94fa9f
commit 8b5f94fa9f
parent ec4343deb0 f188cfbba2
10 changed files with 87 additions and 21 deletions
--- a/airtime_mvc/application/models/Email.php
+++ b/airtime_mvc/application/models/Email.php
@ -35,7 +35,7 @@ class Application_Model_Email
                );
            } else {
                $config = array(
-                    'ssl' => 'ssl'
+                    'ssl' => 'tls'
                );
            }