Merge branch '2.0' into 2.1

Browse Source

* 2.0:
  fixed typo
  [FrameworkBundle] fixed ESI calls

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/HttpKernel.php

...

This commit is contained in:

Fabien Potencier 2012-12-20 23:16:10 +01:00

parent ce536cdd5a bc09ac9eb0

commit 8013469e0b

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