diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-02-23 07:46:07 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-02-23 07:46:07 +0100 |
| commit | 9e53793548e403c155d28a01153026905ee53d5d (patch) | |
| tree | e6f097dd153683abeaf8ed26face545c77bc2467 | |
| parent | 6efa9a2145a067d4034e24f86a0e0e37611472d3 (diff) | |
| parent | 32b46da27a08ebf51e2d8ea1aa82e39c56c0bcfe (diff) | |
| download | symfony-security-9e53793548e403c155d28a01153026905ee53d5d.zip symfony-security-9e53793548e403c155d28a01153026905ee53d5d.tar.gz symfony-security-9e53793548e403c155d28a01153026905ee53d5d.tar.bz2 | |
Merge branch '2.1' into 2.2v2.2.0
* 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
| -rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 5492b4b..083ce94 100644 --- a/composer.json +++ b/composer.json @@ -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" }, |