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 a249f5d582 Merge branch '3.0' into 3.1 ... * 3.0: `@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: src/Symfony/Component/Yaml/Tests/InlineTest.php		2016-06-06 13:42:41 +02:00
..
containers	Merge branch '3.0' into 3.1	2016-05-24 12:06:56 +02:00
directory	[DI][Routing] recursive directory loading	2015-06-02 16:17:59 -07:00
graphviz	[DependencyInjection] Avoid generating call_user_func in more cases	2016-05-19 10:07:44 +02:00
includes	Merge branch '2.3' into 2.6	2015-06-30 18:10:16 +02:00
ini	moved component and bridge unit tests to the src/ directory	2012-03-29 08:37:22 +02:00
php	Merge branch '2.8' into 3.0	2016-06-06 13:33:26 +02:00
xml	Merge branch '3.0' into 3.1	2016-05-24 12:06:56 +02:00
yaml	Merge branch '3.0' into 3.1	2016-05-24 12:06:56 +02:00