diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 12:36:21 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 12:36:21 +0200 |
| commit | e56288b054f87e1c741a1ffa013a4b8ea8bf7ddc (patch) | |
| tree | 78131b155e52b7cca010c1d9e7d543e766210456 /Core/Encoder/EncoderFactory.php | |
| parent | 4746383920bc2bb152808092c7a68fb117e12273 (diff) | |
| parent | e61596f268884e2584fb667016b4c3ad72270a1d (diff) | |
| download | symfony-security-e56288b054f87e1c741a1ffa013a4b8ea8bf7ddc.zip symfony-security-e56288b054f87e1c741a1ffa013a4b8ea8bf7ddc.tar.gz symfony-security-e56288b054f87e1c741a1ffa013a4b8ea8bf7ddc.tar.bz2 | |
Merge branch '2.4'
* 2.4:
fixed types in phpdocs
fixed types in phpdocs
Conflicts:
src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
src/Symfony/Component/Validator/Mapping/ClassMetadata.php
src/Symfony/Component/Validator/Mapping/ElementMetadata.php
src/Symfony/Component/Validator/Mapping/MemberMetadata.php
src/Symfony/Component/Validator/MetadataFactoryInterface.php
Diffstat (limited to 'Core/Encoder/EncoderFactory.php')
0 files changed, 0 insertions, 0 deletions