Commit Graph

10 Commits

Author SHA1 Message Date
Fabien Potencier
a3fbf0082d Merge branch '2.2' into 2.3
* 2.2:
  fixed typo
  bumped Symfony version to 2.2.5
  updated VERSION for 2.2.4
  update CONTRIBUTORS for 2.2.4
  updated CHANGELOG for 2.2.4
  Fixed NativeSessionStorage:regenerate when does not exists
  removed extraneous whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-07-17 07:57:53 +02:00
Fabien Potencier
97e0c4f9e9 updated CHANGELOG for 2.2.4 2013-07-15 14:27:43 +02:00
Fabien Potencier
d7999d7108 Merge branch '2.2' into 2.3
* 2.2:
  [Form] fixed INF usage which does not work on Solaris (closes #8246)
  Fix grammar
  bumped Symfony version to 2.2.4
  updated VERSION for 2.2.3
  update CONTRIBUTORS for 2.2.3
  updated CHANGELOG for 2.2.3
  [Process] Disable exception on stream_select timeout
  [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
  [DomCrawler] added a note about the default charset
  [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
  force the Content-Type to html in the web profiler controllers

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-23 10:16:02 +02:00
Fabien Potencier
bf881db902 updated CHANGELOG for 2.2.3 2013-06-19 14:09:01 +02:00
Fabien Potencier
6b25213e23 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.3-DEV
  updated VERSION for 2.2.2
  updated CHANGELOG for 2.2.2
  removed CHANGELOG for 2.1
  updated VERSION for 2.1.11
  update CONTRIBUTORS for 2.1.11
  updated CHANGELOG for 2.1.11

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-02 18:04:08 +02:00
Fabien Potencier
b9ca806048 updated CHANGELOG for 2.2.2 2013-06-02 15:02:48 +02:00
Garanzha Dmitriy
bc62d5b56f typo fix 2013-04-21 08:44:01 +03:00
Fabien Potencier
3c5ee556fd updated CHANGELOG for 2.2.1 2013-04-06 12:15:29 +02:00
Fabien Potencier
4734354659 updated CHANGELOG for 2.2.0 2013-03-01 07:52:04 +01:00
Fabien Potencier
42930d4a50 updated CHANGELOG for 2.2.0-RC3 2013-02-24 13:06:42 +01:00