diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-07 08:43:00 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-03-07 08:43:00 +0100 |
commit | 73e7adac6f6441c8bac6d18c853ec18081f4f5bd (patch) | |
tree | 7754148c70cbe956886af88436461045f0f29163 /Http/EntryPoint | |
parent | 3f4445d6fc2a41eb27b342fbbf0a6eafeeb80b40 (diff) | |
parent | b883dbdf074f070aaf67e7f6da5bb9af807f7cbd (diff) | |
download | symfony-security-73e7adac6f6441c8bac6d18c853ec18081f4f5bd.zip symfony-security-73e7adac6f6441c8bac6d18c853ec18081f4f5bd.tar.gz symfony-security-73e7adac6f6441c8bac6d18c853ec18081f4f5bd.tar.bz2 |
Merge branch '2.6' into 2.7
* 2.6:
Php Inspections (EA Extended): squash all PR-13813 commits
replaced the last remaining is_integer() call
[2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
[FrameworkBundle] simplify dep declaration
[VarDumper] Fix "next element is already occupied"
[Validator] Added missing galician (gl) translations
[PropertyAccess] stop overwriting once a reference is reached (3rd)
[OptionsResolver] Remove Unused Variable from Foreach Cycles
[travis] Tests Security sub-components
[Twig] bootstrap_3_layout.html.twig is usable as a trait
[travis] Tests Security sub-components
CS fixes
[TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
[travis] test with php nightly
Conflicts:
.travis.yml
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
Diffstat (limited to 'Http/EntryPoint')
0 files changed, 0 insertions, 0 deletions