diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-08-02 22:53:38 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-08-02 22:53:38 +0200 |
| commit | 5b9b5c868b9656dab05a30e858d0554c63e7d0ed (patch) | |
| tree | 1b6f0c7b1d67b7b06252fcaf70c35fd641d441d0 /Core/Authentication/SimpleAuthenticatorInterface.php | |
| parent | b105bb26e3256f474ee13651b94a833b3a9b1262 (diff) | |
| parent | 60cbd835b17c871050fad1cc4a86f506069dbc54 (diff) | |
| download | symfony-security-5b9b5c868b9656dab05a30e858d0554c63e7d0ed.zip symfony-security-5b9b5c868b9656dab05a30e858d0554c63e7d0ed.tar.gz symfony-security-5b9b5c868b9656dab05a30e858d0554c63e7d0ed.tar.bz2 | |
Merge branch '2.2' into 2.3
* 2.2:
[HttpKernel] added a missing dep for dev
[Form] fixed wrong call to setTimeZone() (closes #8644)
Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4
[Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser
[routing] added ability for apache matcher to handle array values
removed dead code and fixed CS
[Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589)
Conflicts:
src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php
src/Symfony/Component/Form/FormConfigBuilder.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Validator/Tests/GraphWalkerTest.php
Diffstat (limited to 'Core/Authentication/SimpleAuthenticatorInterface.php')
0 files changed, 0 insertions, 0 deletions