Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch '2.0' into 2.1

* 2.0:
  updated license year
  Update src/Symfony/Component/HttpFoundation/Response.php
  [Console] fixed unitialized properties (closes #5935)
  [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
  bumped Symfony version to 2.0.21-DEV
  updated VERSION for 2.0.21
  updated CHANGELOG for 2.0.21

Conflicts:
	src/Symfony/Bundle/SwiftmailerBundle/LICENSE
	src/Symfony/Component/Filesystem/LICENSE
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpKernel/Kernel.php
  • Loading branch information...
commit 6f8f803c03a7a0f906b774109ff76b1206c61d09 2 parents 8ede4b6 + e3dd7cb
Fabien Potencier fabpot authored

Showing 1 changed file with 1 addition and 1 deletion. Show diff stats Hide diff stats

  1. +1 1  LICENSE
2  LICENSE
... ... @@ -1,4 +1,4 @@
1   -Copyright (c) 2004-2011 Fabien Potencier
  1 +Copyright (c) 2004-2013 Fabien Potencier
2 2
3 3 Permission is hereby granted, free of charge, to any person obtaining a copy
4 4 of this software and associated documentation files (the "Software"), to deal

0 comments on commit 6f8f803

Please sign in to comment.
Something went wrong with that request. Please try again.