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
Fabien Potencier 0deaceb2ff Merge branch '2.3' into 2.4
* 2.3:
  fix docblock
  Fixed incompatibility of x509 auth with nginx
  [Process] Setting STDIN while running should not be possible
  [FrameworkBundle] improve English in RouterMatchCommand
  [Doctrine Bridge] simplify session handler by using main connection

Conflicts:
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2014-04-22 10:11:06 +02:00
..
BrowserKit Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
ClassLoader Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
Config Merge branch '2.3' into 2.4 2014-04-22 10:11:06 +02:00
Console Fix doc blocks 2014-04-18 22:17:16 +02:00
CssSelector Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
Debug fixed types in phpdocs 2014-04-16 12:34:42 +02:00
DependencyInjection unified return null usages 2014-04-18 22:38:54 +02:00
DomCrawler Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
EventDispatcher Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
ExpressionLanguage fixed types in phpdocs 2014-04-16 12:34:42 +02:00
Filesystem Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
Finder Merge branch '2.3' into 2.4 2014-04-18 23:02:05 +02:00
Form Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
HttpFoundation Merge branch '2.3' into 2.4 2014-04-18 23:02:05 +02:00
HttpKernel minor #10738 [2.4] Fix doc blocks (romainneutron) 2014-04-18 22:41:38 +02:00
Intl Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
Locale Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
OptionsResolver Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
Process Merge branch '2.3' into 2.4 2014-04-22 10:11:06 +02:00
PropertyAccess Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
Routing Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
Security Merge branch '2.3' into 2.4 2014-04-22 10:11:06 +02:00
Serializer Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
Stopwatch Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00
Templating Merge branch '2.3' into 2.4 2014-04-16 12:34:31 +02:00
Translation Merge branch '2.3' into 2.4 2014-04-18 23:02:05 +02:00
Validator [Validator] slovenian translation updated 2014-04-21 21:16:29 +02:00
Yaml Merge branch '2.3' into 2.4 2014-04-18 22:37:09 +02:00