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
Nicolas Grekas a01fd1b673 Merge branch '2.7'
* 2.7:
  Minor hot fix
  [PROCESS] make sure /dev/tty is readable
  [PhpUnitBridge] Allow PHP 5.3.3 to use with Symfony 2.3
  [2.3] require-dev PHPUnit bridge
  [FrameworkBundle] Fixed Shell logo
  [2.3] Update CONTRIBUTING.md
  [2.3][Process] Fixed PhpProcess::getCommandLine() result
  [Debug] Deprecations exception for Symfony internals
  [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
  [PropertyAccess] unify and fix doc
  Enforce UTF-8 charset for core controllers
  Fix the toolbar JS for IE

Conflicts:
	.travis.yml
	src/Symfony/Bridge/PhpUnit/composer.json
2015-02-24 13:15:02 +01:00
..
Bridge Merge branch '2.3' into 2.6 2015-02-24 12:52:21 +01:00
Bundle Merge branch '2.7' 2015-02-24 13:15:02 +01:00
Component Merge branch '2.7' 2015-02-24 13:15:02 +01:00