Bump master to 3.2-dev
This commit is contained in:
parent
14af748840
commit
81186e40db
|
@ -22,31 +22,23 @@
|
||||||
},
|
},
|
||||||
"require-dev":{
|
"require-dev":{
|
||||||
"doctrine/orm": "~2.4",
|
"doctrine/orm": "~2.4",
|
||||||
"doctrine/doctrine-bundle": "~1.2@beta",
|
"doctrine/doctrine-bundle": "~1.2",
|
||||||
"jms/serializer-bundle": "@stable",
|
"jms/serializer-bundle": "@stable",
|
||||||
"phpunit/phpunit": "~4.1",
|
"phpunit/phpunit": "~4.1",
|
||||||
"propel/propel1": "1.6.*",
|
"propel/propel1": "1.6.*",
|
||||||
"pagerfanta/pagerfanta": "1.0.*@dev",
|
"pagerfanta/pagerfanta": "~1.0",
|
||||||
"knplabs/knp-components": "~1.2",
|
"knplabs/knp-components": "~1.2",
|
||||||
"knplabs/knp-paginator-bundle": "~2.4",
|
"knplabs/knp-paginator-bundle": "~2.4",
|
||||||
"symfony/browser-kit" : "~2.3",
|
"symfony/browser-kit" : "~2.3",
|
||||||
"symfony/expression-language" : "~2.4",
|
"symfony/expression-language" : "~2.4",
|
||||||
"symfony/twig-bundle": "~2.3"
|
"symfony/twig-bundle": "~2.3"
|
||||||
},
|
},
|
||||||
"suggest": {
|
|
||||||
"doctrine/orm": "~2.4",
|
|
||||||
"doctrine/mongodb-odm": "1.0.*@dev",
|
|
||||||
"propel/propel1": "1.6.*",
|
|
||||||
"pagerfanta/pagerfanta": "1.0.*@dev",
|
|
||||||
"knplabs/knp-components": "~1.2",
|
|
||||||
"symfony/expression-language" : "~2.4"
|
|
||||||
},
|
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": { "FOS\\ElasticaBundle\\": "" }
|
"psr-4": { "FOS\\ElasticaBundle\\": "" }
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "3.1.x-dev"
|
"dev-master": "3.2.x-dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue