Permalink
Browse files

Merge branch '2.1' into 2.2

* 2.1:
  Defined stable version point of Doctrine.
  [HttpFoundation] Remove Cache-Control when using https download via IE<9 (fixes #6750)
  Update composer.json
  [Form] Fixed TimeType not to render a "size" attribute in select tags
  [Form] Added test for "label" option to accept the value "0"
  Expanded fault-tolerance for unusual cookie dates
  Fix docblock type
  [Form] Fixed "label" option to accept the value "0"
  merged branch jfcixmedia/2.1 (PR #5838)
  [DomCrawler] lowered parsed protocol string (fixes #6986)

Conflicts:
	composer.json
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/time_widget.html.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Form/Tests/Extension/Csrf/EventListener/CsrfValidationListenerTest.php
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Validator/composer.json
  • Loading branch information...
2 parents 6efa9a2 + 32b46da commit 9e53793548e403c155d28a01153026905ee53d5d @fabpot fabpot committed Feb 23, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 composer.json
View
@@ -25,7 +25,7 @@
"symfony/form": "~2.0",
"symfony/routing": ">=2.2,<2.3-dev",
"symfony/validator": ">=2.2,<2.3-dev",
- "doctrine/common": ">=2.2,<2.4-dev",
+ "doctrine/common": "~2.2",
"doctrine/dbal": "~2.2",
"psr/log": "~1.0"
},

0 comments on commit 9e53793

Please sign in to comment.