diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-01-04 18:00:54 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-01-04 18:00:54 +0100 |
commit | e05ddf24cfcfb76cb7c3e1175ebca6ac3af3d1f6 (patch) | |
tree | fc8490de8dac843adca91dfb0a2cde0bb1bc34bc /Tests/Http | |
parent | 4166041efbbd1f8411c5e6697572ec0945f1d606 (diff) | |
parent | 8cd00e30f4a13b0c57c5d98613c3dd533bc1c35a (diff) | |
download | symfony-security-e05ddf24cfcfb76cb7c3e1175ebca6ac3af3d1f6.zip symfony-security-e05ddf24cfcfb76cb7c3e1175ebca6ac3af3d1f6.tar.gz symfony-security-e05ddf24cfcfb76cb7c3e1175ebca6ac3af3d1f6.tar.bz2 |
Merge branch '2.0' into 2.1
* 2.0:
updated license year
Update src/Symfony/Component/HttpFoundation/Response.php
[Console] fixed unitialized properties (closes #5935)
[Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
bumped Symfony version to 2.0.21-DEV
updated VERSION for 2.0.21
updated CHANGELOG for 2.0.21
Conflicts:
src/Symfony/Bundle/SwiftmailerBundle/LICENSE
src/Symfony/Component/Filesystem/LICENSE
src/Symfony/Component/HttpFoundation/Response.php
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Tests/Http')
0 files changed, 0 insertions, 0 deletions