Browse files

Merge branch '2.0' into 2.1

* 2.0:
  bumped Symfony version to 2.0.19-DEV
  updated VERSION for 2.0.18
  update CONTRIBUTORS for 2.0.18
  updated CHANGELOG for 2.0.18
  updated vendors for 2.0.18
  Add to DateFormats 'D M d H:i:s Y T' (closes #5830)

Conflicts:
	CONTRIBUTORS.md
	src/Symfony/Component/HttpKernel/Kernel.php
	tests/Symfony/Tests/Bridge/Monolog/Processor/WebProcessorTest.php
	vendors.php
  • Loading branch information...
2 parents d5ca364 + 3621c00 commit 32e43b5287c3f5379c1470c5dd755fcf5f625d3d @fabpot fabpot committed Oct 25, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 Cookie.php
View
1 Cookie.php
@@ -31,6 +31,7 @@ class Cookie
'D, d-M-y H:i:s T',
'D, d-M-Y H:i:s T',
'D M j G:i:s Y',
+ 'D M d H:i:s Y T',
);
protected $name;

0 comments on commit 32e43b5

Please sign in to comment.