Merge branch '2.0'

Conflicts: composer.json
2012-03-07 10:20:24 +00:00 · 2012-03-07 10:20:24 +00:00 · 41f18a47af
parent b60256e8fd 1f8993557b
commit 41f18a47af
1 changed files with 1 additions and 0 deletions
--- a/composer.json
+++ b/composer.json
@ -13,6 +13,7 @@
    "require": {
        "php": ">=5.3.2",
        "symfony/framework-bundle": "2.1.*",
+        "symfony/console": "2.1.*",
        "ruflin/elastica": "*"
    },
    "autoload": {