diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-02-22 17:12:29 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-02-22 17:12:29 +0100 |
| commit | fc9162da12f3c7b79bec4925787fafa660ba13f2 (patch) | |
| tree | 330dd01bb4cd0b11b4bc0d41be888c176c1c41a6 /Core/Encoder/EncoderFactoryInterface.php | |
| parent | ef02544c8cd8f7c2dfc7d463a4469e86e1c99064 (diff) | |
| parent | 119c9bc1d03fb91b774f7ee279d628bdb6301bdc (diff) | |
| download | symfony-security-fc9162da12f3c7b79bec4925787fafa660ba13f2.zip symfony-security-fc9162da12f3c7b79bec4925787fafa660ba13f2.tar.gz symfony-security-fc9162da12f3c7b79bec4925787fafa660ba13f2.tar.bz2 | |
Merge branch '2.3' into 2.7
* 2.3:
PhpUnitNoDedicateAssertFixer results
Improve Norwegian translations
Simplify markdown for PR template
Conflicts:
src/Symfony/Bridge/Propel1/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php
src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
Diffstat (limited to 'Core/Encoder/EncoderFactoryInterface.php')
0 files changed, 0 insertions, 0 deletions