diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-01-22 08:14:10 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-01-22 08:14:57 +0100 |
| commit | 9614e70a3b18909350c877d83aada298b7380f92 (patch) | |
| tree | a3432865dab026b11bbc1c827ad8ebfcd2d7ef3d /Tests/Core/Encoder | |
| parent | 6335d042d57da0016da722abefd9e1c519c88f2c (diff) | |
| parent | e69d4134a2c4c854132b98e2024d6434f36ebaa2 (diff) | |
| download | symfony-security-9614e70a3b18909350c877d83aada298b7380f92.zip symfony-security-9614e70a3b18909350c877d83aada298b7380f92.tar.gz symfony-security-9614e70a3b18909350c877d83aada298b7380f92.tar.bz2 | |
Merge branch '2.0' into 2.1
* 2.0:
[DependencyInjection] fixed the creation of synthetic services in ContainerBuilder
[Security] PHPDoc in SecurityEvents
[FrameworkBundle] fixed Client::doRequest that must call its parent method (closes #6737)
[Yaml] fixed ignored text when parsing an inlined mapping or sequence (closes #6786)
[Yaml] fixed #6773
[Yaml] fixed #6770
bumped Symfony version to 2.0.23-DEV
Conflicts:
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Yaml/Inline.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
Diffstat (limited to 'Tests/Core/Encoder')
0 files changed, 0 insertions, 0 deletions