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 458ce6da2b Merge branch '2.2' into 2.3
* 2.2:
  Fix several instances of doubled words
  [Finder] Fix iteration fails with non-rewindable streams
  [Finder] Fix unexpected duplicate sub path related AppendIterator issue
  Added type of return value in VoterInterface.
  Fixed two bugs in HttpCache

Conflicts:
	src/Symfony/Component/Finder/Iterator/RecursiveDirectoryIterator.php
2013-05-27 16:49:21 +02:00
..
Bridge Merge branch '2.1' into 2.2 2013-05-27 16:47:40 +02:00
Bundle [FrameworkBundle] removed HttpFoundation classes from HttpKernel cache 2013-05-26 17:11:20 +03:00
Component Merge branch '2.2' into 2.3 2013-05-27 16:49:21 +02:00