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 d5bd9bdd68 Merge branch '2.3' into 2.4 ... * 2.3: fixed types in phpdocs Conflicts: src/Symfony/Bridge/Twig/TwigEngine.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Stopwatch/StopwatchEvent.php src/Symfony/Component/Templating/PhpEngine.php		2014-04-16 12:34:31 +02:00
..
Collator	[Intl] Removed "Stub" prefix from stub classes	2013-04-11 11:28:48 +02:00
DateFormatter	fixed types in phpdocs	2014-04-16 12:30:19 +02:00
Globals	fixed CS	2013-07-01 14:24:43 +02:00
Locale	[Locale] Fixed: Locale::setDefault() throws no exception when "en" is passed	2013-08-24 16:32:55 +02:00
NumberFormatter	Merge branch '2.3' into 2.4	2014-04-16 12:34:31 +02:00
ResourceBundle	[Intl] made RegionBundle and LanguageBundle merge fallback data when using a country-specific locale	2013-08-27 11:55:04 +01:00
Util	[Intl] Refactored Locale component into two new components Icu and Intl	2013-04-05 10:11:14 +02:00