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 d752f74161 Merge branch '2.6' into 2.7 ... * 2.6: [FrameworkBundle] fix routing descriptor for options exit when Twig environment is not set [Routing] fix misleading test for condition [Debug] fix test [Debug] add missing conflict dep rules [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle [HttpFoundation] Make use of isEmpty() method fix missing comma in YamlDumper [VarDumper] fix very special vars handling [Console] Helper\Table->addRow optimization [Console] Helper\Table->addRow optimization Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md		2015-01-15 13:16:13 +01:00
..
containers	Merge branch '2.6' into 2.7	2015-01-15 13:16:13 +01:00
graphviz	[DependencyInjection] deprecated synchronized services	2015-01-09 18:43:28 +01:00
includes	Merge branch '2.3' into 2.5	2014-12-02 21:15:53 +01:00
ini	moved component and bridge unit tests to the src/ directory	2012-03-29 08:37:22 +02:00
php	[DependencyInjection] deprecated synchronized services	2015-01-09 18:43:28 +01:00
xml	Merge branch '2.6' into 2.7	2015-01-15 13:16:13 +01:00
yaml	Merge branch '2.6' into 2.7	2015-01-15 13:16:13 +01:00