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/Component/CssSelector/Tests
Fabien Potencier 8321127cda Merge branch '2.0' into 2.1
* 2.0:
  [Bundle] [FrameworkBundle] fixed indentation in esi.xml services file.
  [TwigBundle] There is no CSS visibility of display, should be visible instead
  [DependencyInjection] fixed a bug where the strict flag on references were lost (closes #6607)
  [HttpFoundation] Check if required shell functions for `FileBinaryMimeTypeGuesser` are not disabled
  [CssSelector] added css selector with empty string
  [HttpFoundation] Docblock for Request::isXmlHttpRequest() now points to Wikipedia
  [DependencyInjection] refactored code to avoid logic duplication

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
2013-01-08 19:16:44 +01:00
..
Node merged 2.0 2012-05-15 18:49:53 +02:00
bootstrap.php moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00
CssSelectorTest.php merged 2.0 2012-05-15 18:49:53 +02:00
TokenizerTest.php Merge branch '2.0' into 2.1 2013-01-08 19:16:44 +01:00
XPathExprTest.php moved component and bridge unit tests to the src/ directory 2012-03-29 08:37:22 +02:00