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/Component/HttpKernel/Fragment
Fabien Potencier c2c156835f Merge branch '2.2' into 2.3
* 2.2:
  Reverts JSON_NUMERIC_CHECK
  Just a Typo
  [Yaml] removed wrong comment removal inside a string block
  Fixing configuration validation error messages.
  [HtppKernel] fixed inline fragment renderer
  fixed inline fragment renderer
  ProgressHelper shows percentage complete.
  Comment fixed: RedrawFrequency is measured in steps.
  fix handling of a default 'template' as a string

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
2013-07-11 21:36:36 +02:00
..
EsiFragmentRenderer.php renamed some classes and Twig functions to more descriptive names (refs #6871) 2013-02-01 15:17:20 +01:00
FragmentHandler.php Fixed PHPDocs 2013-04-21 12:26:17 +00:00
FragmentRendererInterface.php renamed some classes and Twig functions to more descriptive names (refs #6871) 2013-02-01 15:17:20 +01:00
HIncludeFragmentRenderer.php Merge branch '2.2' into 2.3 2013-07-11 21:36:36 +02:00
InlineFragmentRenderer.php Merge branch '2.2' into 2.3 2013-07-11 21:36:36 +02:00
RoutableFragmentRenderer.php renamed some classes and Twig functions to more descriptive names (refs #6871) 2013-02-01 15:17:20 +01:00