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/Bridge
Fabien Potencier 47c686db88 Merge branch '2.4' into 2.5
* 2.4:
  updated VERSION for 2.4.7
  updated CHANGELOG for 2.4.7
  bumped Symfony version to 2.3.18
  updated VERSION for 2.3.17
  update CONTRIBUTORS for 2.3.17
  updated CHANGELOG for 2.3.17
  added XSD to PHPUnit configuration
  add missing docblock for ProcessBuilder::addEnvironmentVariables()
  bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
  [Translation] Added unescaping of ids in PoFileLoader
  updated italian translation for validation messages
  [DomCrawler] Fix docblocks and formatting.
  [DomCrawler] Remove the query string and the anchor of the uri of a link
  Simplified the Travis test command
  Remove Expression Language services when the component is unavailable
  [Console] Make sure formatter is the same

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-08 14:21:33 +02:00
..
Doctrine Merge branch '2.4' into 2.5 2014-07-08 14:21:33 +02:00
Monolog Merge branch '2.4' into 2.5 2014-07-08 14:21:33 +02:00
Propel1 Merge branch '2.4' into 2.5 2014-07-08 14:21:33 +02:00
ProxyManager Merge branch '2.4' into 2.5 2014-07-08 14:21:33 +02:00
Swiftmailer Merge branch '2.4' 2014-04-16 10:08:40 +02:00
Twig Merge branch '2.4' into 2.5 2014-07-08 14:21:33 +02:00