Permalink
Browse files

Merge branch '2.3'

* 2.3:
  fixed phpdoc
  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/Serializer/Encoder/XmlEncoder.php
  • Loading branch information...
2 parents ad276bc + a175521 commit e2ce3164ab58b4d54612e630571f158035ee8603 @fabpot fabpot committed Sep 19, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 README.md
View
@@ -36,6 +36,6 @@ Resources
You can run the unit tests with the following command:
$ cd path/to/Symfony/Component/Finder/
- $ composer.phar install --dev
+ $ composer.phar install
$ phpunit

0 comments on commit e2ce316

Please sign in to comment.