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 0ed0e64d43 Merge branch '2.8' into 3.0 ... * 2.8: `@throws` annotations should go after `@return` Fix merge updated VERSION for 2.3.42 update CONTRIBUTORS for 2.3.42 updated CHANGELOG for 2.3.42 Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)" Partial revert of previous PR [DependencyInjection] Skip deep reference check for 'service_container' Catch \Throwable [Serializer] Add missing @throws annotations Fix for #18843 force enabling the external XML entity loaders Removed UTC specification with timestamp Conflicts: CHANGELOG-2.3.md src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php src/Symfony/Component/Config/Loader/FileLoader.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/Finder/Expression/Expression.php src/Symfony/Component/Finder/Finder.php src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php		2016-06-06 13:33:26 +02:00
..
DelegatingLoader.php	Merge branch '2.8' into 3.0	2016-06-06 13:33:26 +02:00
RedirectableUrlMatcher.php	Remove aligned '=>' and '='	2014-10-26 08:30:58 +01:00
Router.php	feature #13396 [Routing] remove deprecations for 3.0 (Tobion)	2015-01-31 21:34:12 +01:00