Permalink
Browse files

Merge branch '2.1'

* 2.1:
  removed unused use statements
  [Form] Adapted HTML5 format in DateTimeType as response to a closed ICU ticket
  [2.1][HttpFoundation] Fixed Php doc in Request::get
  bumped Symfony version to 2.1.4-DEV
  updated VERSION for 2.1.3
  update CONTRIBUTORS for 2.1.3
  updated CHANGELOG for 2.1.3
  merged branch jakzal/yamlDoubleQuotesDumperFix (PR #4320)

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
  • Loading branch information...
2 parents d5e62df + fda9686 commit 42615903d31819056a96061abc7f9c05e6407c21 @fabpot fabpot committed Nov 4, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 Output/ConsoleOutput.php
View
@@ -11,7 +11,6 @@
namespace Symfony\Component\Console\Output;
-use Symfony\Component\Console\Formatter\OutputFormatter;
use Symfony\Component\Console\Formatter\OutputFormatterInterface;
use Symfony\Component\Console\Output\ConsoleOutputInterface;

0 comments on commit 4261590

Please sign in to comment.