merged branch stof/patch-2 (PR symfony#474)

fabpot · fabpot · commit 7bf30507fffb · 2013-01-12T21:30:11.000+01:00
This PR was merged into the master branch. Commits ------- 143a6a2 Updated the DoctrineBundle version Discussion ---------- Updated the DoctrineBundle version We need to use 1.2.x for Symfony 2.2
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         "php": ">=5.3.3",
         "symfony/symfony": "2.2.*",
         "doctrine/orm": ">=2.2.3,<2.4-dev",
-        "doctrine/doctrine-bundle": "1.0.*",
+        "doctrine/doctrine-bundle": "1.2.*",
         "twig/extensions": "1.0.*",
         "symfony/assetic-bundle": "2.1.*",
         "symfony/swiftmailer-bundle": "2.2.*",
