Merge branch '2.4' into 2.5

* 2.4: Fixed version for composer install Conflicts: quick_tour/the_big_picture.rst
symfony · Sep 15, 2014 · f732747 · f732747
2 parents 1018da8 + 4267086
commit f732747
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -20,7 +20,7 @@ directory:
 
 .. code-block:: bash
 
-    $ composer create-project symfony/framework-standard-edition myproject/ '~2.5'
+    $ composer create-project symfony/framework-standard-edition myproject/ '~2.3'
 
 .. note::