merged branch guilhermeblanco/patch-13 (PR #7160)

This PR was merged into the 2.1 branch.

Commits
-------

f0704aa Update composer.json

Discussion
----------

Update composer.json

Bump doctrine common dependency for symfony 2.1 users

---------------------------------------------------------------------------

by stof at 2013-02-22T17:32:25Z

@guilhermeblanco what about using ``~2.2`` as Doctrine keeps BC between minor versions ?
This commit is contained in:
Fabien Potencier 2013-02-22 18:52:47 +01:00
commit e10cd192a8

View File

@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.3.3",
"doctrine/common": ">2.2,<2.4-dev",
"doctrine/common": ">2.2,<2.5-dev",
"twig/twig": ">=1.9.1,<2.0-dev"
},
"replace": {