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 2104813ca2 Merge branch '2.5'
* 2.5:
  [2.3] Add missing development dependencies
  Fix @return docs on HttpCache::restoreResponseBody()
  [Finder] Escape location for regex searches
  Make sure HttpCache is a trusted proxy

Conflicts:
	src/Symfony/Component/Form/composer.json
2014-09-22 17:29:07 +02:00
..
Bridge Merge branch '2.5' 2014-09-22 17:29:07 +02:00
Bundle Merge branch '2.5' 2014-09-22 17:29:07 +02:00
Component Merge branch '2.5' 2014-09-22 17:29:07 +02:00