Merge branch '2.6' into 2.7

Browse Source

* 2.6:
  [minor] composer.json fix
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json

...

This commit is contained in:

Nicolas Grekas 2015-02-24 14:41:26 +01:00

parent d4802aa92b 76e736eeb7

commit 65e4a5aaf4

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

Diff Content Not Available