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
Nicolas Grekas 7adba99975 Merge branch '2.3' into 2.6
* 2.3:
  [HttpKernel] Embed the original exception as previous to bounced exceptions
  [Enhancement] netbeans - force interactive shell when limited detection
  [StringUtil] Fixed singularification of 'movies'
  Fix some phpdocs for Twig extensions & templating helpers
  Use specialized config methods instead of the generic ifTrue() method
  [DoctrineBridge] Add missing variable declaration in testcase

Conflicts:
	src/Symfony/Component/Console/Application.php
2015-04-03 17:17:51 +02:00
..
BrowserKit Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
ClassLoader Merge branch '2.3' into 2.6 2015-03-27 11:19:51 +01:00
Config Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
Console Merge branch '2.3' into 2.6 2015-04-03 17:17:51 +02:00
CssSelector Merge branch '2.3' into 2.6 2015-03-22 17:55:57 +01:00
Debug [Debug] Tweak docblocks 2015-04-03 09:48:36 +02:00
DependencyInjection Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
DomCrawler Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
EventDispatcher [2.6] add @group legacy 2015-03-13 18:37:22 +01:00
ExpressionLanguage [ExpressionLanguage] fixed issues when parsing postfix expressions 2015-03-17 07:52:13 +01:00
Filesystem Merge branch '2.3' into 2.6 2015-03-22 17:55:57 +01:00
Finder Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
Form Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
HttpFoundation Merge branch '2.3' into 2.6 2015-04-01 18:50:12 +02:00
HttpKernel Merge branch '2.3' into 2.6 2015-04-03 17:17:51 +02:00
Intl Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
Locale Merge branch '2.3' into 2.6 2015-02-24 12:52:21 +01:00
OptionsResolver [2.6] add @group legacy 2015-03-13 18:37:22 +01:00
Process Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
PropertyAccess Merge branch '2.3' into 2.6 2015-04-03 17:17:51 +02:00
Routing Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
Security Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
Serializer Merge branch '2.3' into 2.6 2015-03-22 17:55:57 +01:00
Stopwatch Merge branch '2.3' into 2.6 2015-03-22 17:55:57 +01:00
Templating [2.6] add @group legacy 2015-03-13 18:37:22 +01:00
Translation Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
Validator Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00
VarDumper Revert "Added missing changelog entry" 2015-04-03 09:54:01 +02:00
Yaml Merge branch '2.3' into 2.6 2015-03-30 17:54:10 +02:00