Commit Graph

6 Commits

Author SHA1 Message Date
Nicolas Grekas
586c58a354 Merge branch '3.0'
* 3.0:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed for 2.7
  bumped Symfony version to 3.0.2
  Do not use HttpKernel Extension when not needed
  updated VERSION for 3.0.1
  updated CHANGELOG for 3.0.1
  bumped Symfony version to 2.8.2
  updated VERSION for 2.8.1
  updated CHANGELOG for 2.8.1
  bumped Symfony version to 2.7.9
  updated VERSION for 2.7.8
  updated CHANGELOG for 2.7.8
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2015-12-28 14:15:29 +01:00
Fabien Potencier
9dda04c238 updated CHANGELOG for 3.0.1 2015-12-26 17:46:07 +01:00
Elias Van Ootegem
6508b3db7c Fix typo in changelog 2015-12-21 09:40:12 +00:00
Fabien Potencier
a882401dd2 updated CHANGELOG for 3.0.0 2015-11-30 21:59:12 +01:00
Fabien Potencier
af74da51b3 updated CHANGELOG for 3.0.0 2015-11-30 21:58:04 +01:00
Fabien Potencier
803c8f10ad updated CHANGELOG for 3.0.0-BETA1 2015-11-16 15:06:50 +01:00