diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-06 20:20:34 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-09-06 20:20:34 +0200 |
| commit | 73e267b8033bc9da70dc4cd0e51f9e77278aecff (patch) | |
| tree | 63601bb472f011fe3c4aad6877de9967a6ec21fc /Http/AccessMap.php | |
| parent | 66940a64ab627badd5df3816d6613d2e21753850 (diff) | |
| parent | 21ac0805b6ab455862ecadad5f1bfb9a524c4087 (diff) | |
| download | symfony-security-73e267b8033bc9da70dc4cd0e51f9e77278aecff.zip symfony-security-73e267b8033bc9da70dc4cd0e51f9e77278aecff.tar.gz symfony-security-73e267b8033bc9da70dc4cd0e51f9e77278aecff.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
Fixing singular form for kisses, accesses and addresses.
fixed some circular references
[Security] fixed a leak in ExceptionListener
[Security] fixed a leak in the ContextListener
Ignore posix_istatty warnings
typos
[HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)
Return BC compatibility for `@Route` parameters and default values
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
src/Symfony/Component/Console/Application.php
Diffstat (limited to 'Http/AccessMap.php')
0 files changed, 0 insertions, 0 deletions