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 14cb1fa3d0 Merge branch '2.2'
* 2.2:
  bumped Symfony version to 2.1.11-DEV
  updated VERSION for 2.1.10
  update CONTRIBUTORS for 2.1.10
  updated CHANGELOG for 2.1.10
  fixed CS
  [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
  [Filesystem] Fix regression introduced in 10dea948

Conflicts:
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2013-05-06 22:03:44 +02:00
..
BrowserKit Merge branch '2.2' 2013-04-30 09:16:44 +02:00
ClassLoader Merge branch '2.2' 2013-05-06 22:03:44 +02:00
Config added missing license blocks 2013-04-22 06:31:56 +02:00
Console Merge branch '2.2' 2013-05-06 10:44:35 +02:00
CssSelector merged branch dantleech/enforce_sprintf_for_exceptions (PR #7620) 2013-04-11 08:50:46 +02:00
Debug [Debug] tweak for #6474 2013-05-01 20:15:41 +03:00
DependencyInjection Merge branch '2.2' 2013-05-06 10:44:35 +02:00
DomCrawler fixed CS 2013-05-06 08:26:30 +02:00
EventDispatcher Merge branch '2.2' 2013-02-11 12:27:01 +01:00
Filesystem Merge branch '2.2' 2013-05-06 22:03:44 +02:00
Finder [Finder] Fix tests on windows 2013-04-25 14:12:10 +02:00
Form Merge branch '2.2' 2013-05-06 22:03:44 +02:00
HttpFoundation Reverted a part of f5e7f24819 2013-05-06 10:11:45 +02:00
HttpKernel Merge branch '2.2' 2013-05-06 22:03:44 +02:00
Intl added missing license blocks 2013-04-22 06:31:56 +02:00
Locale [Locale] Removed "Stub" prefixes in Intl component 2013-04-11 11:29:25 +02:00
OptionsResolver Enforce sprintf for exceptions 2013-04-11 08:50:46 +02:00
Process Merge branch '2.2' 2013-05-06 22:03:44 +02:00
PropertyAccess merged branch danielholmes/prop_access_additions (PR #7876) 2013-04-30 18:43:32 +02:00
Routing fixed CS 2013-05-06 12:48:41 +02:00
Security Merge branch '2.2' 2013-05-06 10:44:35 +02:00
Serializer Fixed PHPDocs 2013-04-21 12:26:17 +00:00
Stopwatch [Stopwatch] Fix array definition from 5.4 2013-04-17 10:17:10 +03:00
Templating Merge branch '2.2' 2013-04-17 07:31:37 +02:00
Translation made some optimization when parsing YAML files 2013-05-05 19:11:25 +02:00
Validator Merge branch '2.2' 2013-05-06 10:44:35 +02:00
Yaml Fixed PHPDocs 2013-04-21 12:26:17 +00:00