diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-01-24 15:36:08 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-01-24 15:36:08 +0100 |
| commit | c8e2d4a8bc6cb7bf9418a57e680278723aa76f94 (patch) | |
| tree | c2eb9450fe71fc2b6f89e4ec62b95a69168020be /Core/Tests/Encoder | |
| parent | 243eb156955e2427dabd3e5b6ecb68dae09ebbea (diff) | |
| parent | 3dbf1fddbcd36fac27982869cdc6fbb4ff03b89a (diff) | |
| download | symfony-security-c8e2d4a8bc6cb7bf9418a57e680278723aa76f94.zip symfony-security-c8e2d4a8bc6cb7bf9418a57e680278723aa76f94.tar.gz symfony-security-c8e2d4a8bc6cb7bf9418a57e680278723aa76f94.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3: (30 commits)
Update validators.ro.xlf
add non-standard port to HTTP_HOST
fixed attribute "source-language" for translations
Update PluralizationRules.php
Update validators.pt_BR.xlf
Translated remaining items (57-72)
Updated Vietnamese translation
added missing dot in translation
updated Arabic translations
Update validators.id.xlf
[Validator] Translate validator messages into Brazilian Portuguese
Added more Swedish validator translations
Update validators.ca.xlf
fixed typos in Welsh translation
Added missing Croatian translations
[Form] fixed allow render 0 and 0.0 numeric input values
Fixed validators.nl.xlf
[Component/Security] Fixed some phpdocs in Security/Core
Completed Luxembourgish translation
Fixing the Logger deprecation notices to match the correct method name it should be informing of
...
Conflicts:
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget_simple.html.php
src/Symfony/Component/Console/Application.php
Diffstat (limited to 'Core/Tests/Encoder')
0 files changed, 0 insertions, 0 deletions