This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.

Fabien Potencier a25fad847b Merge branch '2.0' into 2.1 ... * 2.0: [Yaml] fixed default value Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes. added a way to enable/disable object support when parsing/dumping added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse() [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689) Conflicts: src/Symfony/Component/Yaml/Dumper.php src/Symfony/Component/Yaml/Parser.php src/Symfony/Component/Yaml/Tests/DumperTest.php src/Symfony/Component/Yaml/Tests/ParserTest.php src/Symfony/Component/Yaml/Yaml.php		2013-01-17 16:20:05 +01:00
..
Doctrine	Removed underscores from test method names to be consistent with other components.	2013-01-11 00:31:43 +00:00
Monolog	removed the .gitattributes files (closes #6605, reverts #5674)	2013-01-09 09:51:07 +01:00
Propel1	removed the .gitattributes files (closes #6605, reverts #5674)	2013-01-09 09:51:07 +01:00
Swiftmailer	removed the .gitattributes files (closes #6605, reverts #5674)	2013-01-09 09:51:07 +01:00
Twig	Merge branch '2.0' into 2.1	2013-01-17 16:20:05 +01:00