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.

Fabien Potencier a91cbbd907 Merge branch '2.7' ... * 2.7: Fix getComputedData added a Twig panel to the WebProfiler integrated the Twig profiler fixed condition fixed tests fixed PHP 5.3 compat Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php src/Symfony/Bundle/WebProfilerBundle/composer.json		2015-01-25 20:10:41 +01:00
..
CacheWarmer	Docblock fixes	2014-11-30 13:33:44 +00:00
Command	[2.7] Added deprecated in debug command	2015-01-16 22:25:19 +01:00
Controller	Revert "minor #12821 Remove deprecated class (MasterB)"	2014-12-04 10:43:55 +01:00
Debug	integrated the Twig profiler	2015-01-25 19:10:07 +01:00
DependencyInjection	Merge branch '2.7'	2015-01-25 20:10:41 +01:00
Extension	[TwigBundle] added some missing deprecation notices	2015-01-14 07:07:14 +01:00
Loader	Merge branch '2.3' into 2.5	2014-11-28 11:00:29 +01:00
Resources	Merge branch '2.7'	2015-01-25 20:10:41 +01:00
Tests	removed deprecated Twig features	2015-01-16 08:41:15 +01:00
.gitignore	Added missing files .gitignore	2013-07-21 14:12:18 +02:00
CHANGELOG.md	[WIP] [TwigBundle] [Exception] Make return value similar to error.json.twig	2014-09-22 18:01:04 +02:00
composer.json	[TwigBundle] bumped deps for HttpKernel	2015-01-12 22:48:35 +01:00
phpunit.xml.dist	[Tests] Silenced all deprecations in tests for 2.3	2014-12-18 20:00:19 +01:00
TwigBundle.php	[TwigBundle] Adds service check for extension loading	2013-03-14 12:28:51 +01:00
TwigEngine.php	removed deprecated Twig features	2015-01-16 08:41:15 +01:00