Merge branch '2.0'

Conflicts:
	composer.json
This commit is contained in:
Richard Miller 2012-07-10 22:50:04 +01:00
commit c7e0e88ece

View file

@ -15,7 +15,7 @@
"symfony/framework-bundle": "2.1.*",
"symfony/console": "2.1.*",
"symfony/form": "2.1.*",
"ruflin/elastica": ">=0.19.3"
"ruflin/elastica": "0.19.3"
},
"require-dev":{
"doctrine/orm":"2.2.*",