Merge branch '2.3'

* 2.3: fixed typo
2013-08-02 23:25:28 +02:00 · 2013-08-02 23:25:28 +02:00 · 80d4d5bc4e
commit 80d4d5bc4e
parent 4ee3d7f11a 00c0237efa
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@ -31,7 +31,7 @@
        "symfony/finder": "~2.0",
        "symfony/process": "~2.0",
        "symfony/routing": "~2.2",
-        "symfony/stopwatch": "~2.2"
+        "symfony/stopwatch": "~2.2",
        "symfony/templating": "~2.2"
    },
    "suggest": {