merged branch guilhermeblanco/patch-1 (PR #498)

fabpot · fabpot · commit d7b59bdcd5b0 · 2013-02-22T18:54:48.000+01:00
This PR was merged into the 2.1 branch. Commits ------- b118637 Update composer.json Discussion ---------- Update composer.json Bump doctrine dependency for symfony 2.1 users.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/symfony": "2.1.*",
-        "doctrine/orm": ">=2.2.3,<2.4-dev",
+        "doctrine/orm": ">=2.2.3,<2.5-dev",
         "doctrine/doctrine-bundle": "1.1.*",
         "twig/extensions": "1.0.*@dev",
         "symfony/assetic-bundle": "2.1.*",
