Merge branch '2.8'

Browse Source

* 2.8:
  Fix one dependency requirement

Conflicts:
	src/Symfony/Component/Serializer/composer.json

...

This commit is contained in:

Nicolas Grekas 2015-08-06 11:14:20 +02:00

parent 352d8954e9 5d8e00f457

commit 11de7b3996

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