Merge with 3.7

This commit is contained in:
Romain Neutron
2012-10-10 11:34:21 +02:00
30 changed files with 586 additions and 396 deletions

View File

@@ -25,7 +25,7 @@
"swiftmailer/swiftmailer": "4.1.*",
"symfony/symfony": ">=2.1",
"tecnick.com/tcpdf": "dev-master",
"twig/twig": "1.9.*",
"twig/twig": ">=1.9",
"twig/extensions": "master",
"zend/gdata": ">1.11"
},