Merge branch '2.0'

Conflicts: composer.json
FriendsOfSymfony · Dec 31, 2011 · e544c98 · e544c98
2 parents eaf87a1 + 6336279
commit e544c98
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -19,15 +19,17 @@
             "homepage": "https://github.com/friendsofsymfony/FOSRestBundle/contributors"
         }
     ],
+
     "require": {
         "php":                            ">=5.3.2",
-        "symfony/symfony":                ">=2.1.0-dev",
-        "doctrine/common":                ">=2.1.0",
+        "symfony/framework-bundle":       ">=2.1.0-dev",
         "sensio/framework-extra-bundle":  "*",
         "jms/serializer-bundle":          "*"
     },
+
     "autoload": {
         "psr-0": { "FOS\\RestBundle": "" }
     },
+
     "target-dir": "FOS/RestBundle"
 }