Permalink
Browse files

Merge branch '2.2' into 2.3

* 2.2:
  Fix some annotates
  [FrameworkBundle] made sure that the debug event dispatcher is used everywhere
  [HttpKernel] remove unneeded strtoupper
  updated the composer install command to reflect changes in Composer

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
	src/Symfony/Component/Locale/Locale.php
	src/Symfony/Component/Locale/README.md
	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
  • Loading branch information...
2 parents ef0a673 + dffe0df commit 07c705b638c6d6f7dbc2d0a4e3a61e7d056da37d @fabpot fabpot committed Sep 19, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 README.md
View
@@ -41,5 +41,5 @@ Resources
You can run the unit tests with the following command:
$ cd path/to/Symfony/Component/Filesystem/
- $ composer.phar install --dev
+ $ composer.phar install
$ phpunit

0 comments on commit 07c705b

Please sign in to comment.