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 d5c873cf5a Merge branch '2.6' into 2.7
* 2.6:
  [Validator] Add missing pt_BR translations
  Add parsing of hexadecimal strings for PHP 7
  [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition
  [Validator] Added missing Hungarian translation
  [Validator] Fixed grammar in Hungarian translation
  CS: Unary operators should be placed adjacent to their operands
  CS: Binary operators should be arounded by at least one space
  remove useless tests that fail in php 7
  [Translator] fix test for php 7 compatibility
  Update phpdoc of ProcessBuilder#setPrefix()

Conflicts:
	src/Symfony/Bridge/Propel1/Logger/PropelLogger.php
	src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
2015-03-30 17:55:07 +02:00
..
Doctrine Merge branch '2.6' into 2.7 2015-03-30 17:55:07 +02:00
Monolog Merge branch '2.3' into 2.6 2015-02-24 12:52:21 +01:00
PhpUnit Trim final stop from deprecation message 2015-03-29 12:32:48 +02:00
ProxyManager Merge branch '2.6' into 2.7 2015-03-30 17:55:07 +02:00
Swiftmailer Merge branch '2.3' into 2.6 2015-02-24 12:52:21 +01:00
Twig Merge branch '2.6' into 2.7 2015-03-30 10:18:42 +02:00