Fabien Potencier
|
2314328b16
|
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
|
2014-04-16 12:36:21 +02:00 |
|