merged 2.0

This commit is contained in:
Fabien Potencier 2012-06-29 18:03:08 +02:00
commit 62100f1a18
2 changed files with 2 additions and 2 deletions

View File

@ -18,5 +18,5 @@ AnnotationRegistry::registerFile(__DIR__.'/vendor/doctrine/orm/lib/Doctrine/ORM/
if (is_file(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php')) {
require_once __DIR__.'/vendor/swiftmailer/swiftmailer/lib/classes/Swift.php';
Swift::registerAutoload(__DIR__.'/vendor/swiftmailer/swiftmailer/lib/swift_init.php');
Swift::registerAutoload(function () { require __DIR__.'/vendor/swiftmailer/swiftmailer/lib/swift_init.php'; });
}

View File

@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.3.3",
"swiftmailer/swiftmailer": ">=4.1.2,<4.3-dev"
"swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev"
},
"suggest": {
"symfony/http-kernel": "self.version"