diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 09:01:13 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-03 09:01:13 +0100 |
| commit | 21a953b1896d6c3e886f1dd3819793be207d09b6 (patch) | |
| tree | 058f36957b3bd875b1335101ecfda8e8cc1c0545 /Core/Encoder | |
| parent | cc74cd3d9a743d675ec0587456d7052afc5c09a1 (diff) | |
| parent | 00cfda134e85ea2a8ca208139cc84c4bcd2a012d (diff) | |
| download | symfony-security-21a953b1896d6c3e886f1dd3819793be207d09b6.zip symfony-security-21a953b1896d6c3e886f1dd3819793be207d09b6.tar.gz symfony-security-21a953b1896d6c3e886f1dd3819793be207d09b6.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
Use PHPUnit ini_set wrapper in tests
[Process] Added a test skip check for Windows
[Process] Removed unused variable assignment
Fixes various phpdoc and coding standards.
Fixes Issue #13184 - incremental output getters now return empty strings
Updated copyright to 2015
Conflicts:
src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
Diffstat (limited to 'Core/Encoder')
0 files changed, 0 insertions, 0 deletions