Merge branch '2.3' into 2.7

Browse Source

* 2.3:
  [Console] Fix whitespaces in fixture

Conflicts:
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt

...

This commit is contained in:

Nicolas Grekas 2015-09-19 22:42:33 +02:00

parent 1ba6cfee48 da29357d49

commit f64cf23811

2 changed files with 137 additions and 137 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files