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.
symfony/src/Symfony
Fabien Potencier 22970e007e Merge branch '2.4'
* 2.4:
  added missing @deprecated tag
  Fixed recursion level incrementing in FlattenException::flattenArgs().
  [HttpKernel] fixed wrong reference in TraceableEventDispatcher

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
2014-02-04 12:21:37 +01:00
..
Bridge Merge branch '2.4' 2014-01-26 22:33:16 +01:00
Bundle Merge branch '2.4' 2014-02-04 12:21:37 +01:00
Component Merge branch '2.4' 2014-02-04 12:21:37 +01:00