diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-08 09:43:12 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-08 09:43:12 +0100 |
| commit | 56293f4fe279688891cf6e4f99f381703c4b0c6e (patch) | |
| tree | 908ca648493938b1911ae803e9ae4dfecd429506 /Core/Tests/Encoder | |
| parent | 1aaa26cad526c885a0ffd4fcef8a855a63024725 (diff) | |
| parent | 16bedc2baf42deacbe8f0a48f311557c7859d3dc (diff) | |
| download | symfony-security-56293f4fe279688891cf6e4f99f381703c4b0c6e.zip symfony-security-56293f4fe279688891cf6e4f99f381703c4b0c6e.tar.gz symfony-security-56293f4fe279688891cf6e4f99f381703c4b0c6e.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
fix phpdoc's alignment
Minor phpcs fixes
[ClassLoader] Fix undefined index in ClassCollectionLoader
Conflicts:
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
Diffstat (limited to 'Core/Tests/Encoder')
0 files changed, 0 insertions, 0 deletions