diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 15:29:53 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-05 15:29:53 +0100 |
| commit | 79471f92de28ed0acf9cce11051ebc47964acfbb (patch) | |
| tree | 702963c8c829cda73762be39f2250ff7a16eb724 /Http | |
| parent | c7f654d74131094b02c247373982d6f9b4287dfa (diff) | |
| parent | 887bcdd527e7a428d5073db41213d18cdc10b8ef (diff) | |
| download | symfony-security-79471f92de28ed0acf9cce11051ebc47964acfbb.zip symfony-security-79471f92de28ed0acf9cce11051ebc47964acfbb.tar.gz symfony-security-79471f92de28ed0acf9cce11051ebc47964acfbb.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[2.6] cleanup deprecated uses
[2.5] cleanup deprecated uses
Conflicts:
src/Symfony/Component/Form/composer.json
src/Symfony/Component/Security/Tests/Core/LegacySecurityContextInterfaceTest.php
Diffstat (limited to 'Http')
0 files changed, 0 insertions, 0 deletions