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.

Nicolas Grekas 304097705c Merge branch '2.8' into 3.0 ... * 2.8: [travis] timeout the sigchild tests at 60s CS: Single line comments should use double slashes (//) and not hash (#). Do not use HttpKernel Extension when not needed for 2.7 Do not use HttpKernel Extension when not needed bumped Symfony version to 2.8.2 updated VERSION for 2.8.1 updated CHANGELOG for 2.8.1 bumped Symfony version to 2.7.9 updated VERSION for 2.7.8 updated CHANGELOG for 2.7.8 bumped Symfony version to 2.3.37 updated VERSION for 2.3.36 update CONTRIBUTORS for 2.3.36 updated CHANGELOG for 2.3.36 Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"" Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)" use nowdoc instead of heredoc Conflicts: CHANGELOG-2.3.md CHANGELOG-2.7.md CHANGELOG-2.8.md src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php src/Symfony/Bundle/WebProfilerBundle/Command/ExportCommand.php src/Symfony/Bundle/WebProfilerBundle/Command/ImportCommand.php src/Symfony/Component/Console/Shell.php src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/HttpKernel/Kernel.php		2015-12-28 14:14:56 +01:00
..
Bundle	Merge branch '2.8' into 3.0	2015-12-28 14:14:56 +01:00
Generator	Fix phpdoc and coding standards	2014-12-29 23:41:34 +01:00
Provider	[Intl] Integrated ICU data into Intl component	2014-09-26 16:16:55 +02:00
Util	[Intl] Integrated ICU data into Intl component	2014-09-26 16:16:55 +02:00