Skip to content

Commit

Permalink
Merge branch '2.3'
Browse files Browse the repository at this point in the history
* 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
fabpot committed Sep 19, 2013
2 parents ad276bc + a175521 commit e2ce316
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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.