Skip to content

Commit 32e43b5

Browse files
committed
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
2 parents d5ca364 + 3621c00 commit 32e43b5

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Cookie.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class Cookie
3131
'D, d-M-y H:i:s T',
3232
'D, d-M-Y H:i:s T',
3333
'D M j G:i:s Y',
34+
'D M d H:i:s Y T',
3435
);
3536

3637
protected $name;

0 commit comments

Comments
 (0)