|
@@ -61,9 +61,8 @@
|
|
|
"stof/doctrine-extensions-bundle": "^1.2",
|
|
|
"voryx/restgeneratorbundle": "dev-master",
|
|
|
"base-admin": "dev-master",
|
|
|
- "webservice": "dev-master",
|
|
|
- "symfony/workflow": "^3.2",
|
|
|
"base-oauth-bundle": "dev-master",
|
|
|
+ "webservice": "dev-master",
|
|
|
"hwi/oauth-bundle": "^0.5.3"
|
|
|
},
|
|
|
"require-dev": {
|
|
@@ -93,9 +92,14 @@
|
|
|
"symfony-web-dir": "web",
|
|
|
"symfony-tests-dir": "tests",
|
|
|
"symfony-assets-install": "relative",
|
|
|
- "incenteev-parameters": {
|
|
|
- "file": "app/config/parameters.yml"
|
|
|
- },
|
|
|
+ "incenteev-parameters": [
|
|
|
+ {
|
|
|
+ "file": "app/config/parameters.yml"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "file": "app/config/hwioauthbundle/parameters.yml"
|
|
|
+ }
|
|
|
+ ],
|
|
|
"branch-alias": null
|
|
|
}
|
|
|
}
|