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/.composer
Nicolas Grekas eb23f056f0 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Disable hirak/prestissimo for deps=low/high tests
  [HttpFoundation] fix phpdoc of UploadedFile
  [ci] Skip dns-sensitive tests when DnsMock is not found
  Optimize ReplaceAliasByActualDefinitionPass
  [Process] use __METHOD__ where applicable

Conflicts:
	.travis.yml
	src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
2016-04-02 09:48:01 +02:00
..
composer.json [travis] Disable hirak/prestissimo for deps=low/high tests 2016-04-02 09:08:03 +02:00
composer.lock [travis] Disable hirak/prestissimo for deps=low/high tests 2016-04-02 09:08:03 +02:00
config.json [travis] Disable hirak/prestissimo for deps=low/high tests 2016-04-02 09:08:03 +02:00