Skip to content

Commit

Permalink
Merge pull request #926 from open-orchestra/revert-925-update_vendor_…
Browse files Browse the repository at this point in the history
…tag1.1.1

Revert "update vendor tag 1.1.1"
  • Loading branch information
alavieille committed May 11, 2016
2 parents 7429f75 + 77822f4 commit 2e39560
Show file tree
Hide file tree
Showing 2 changed files with 261 additions and 127 deletions.
25 changes: 18 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,25 @@
},
"require": {
"incenteev/composer-parameter-handler": "~2.0",
"open-orchestra/open-orchestra-cms-bundle": "1.1.1",
"open-orchestra/open-orchestra-media-admin-bundle": "1.1.1",
"open-orchestra/open-orchestra-model-bundle": "1.1.1",
"open-orchestra/open-orchestra-base-api-mongo-model-bundle": "1.1.1",
"open-orchestra/open-orchestra-elastica-bundle": "1.1.1",
"open-orchestra/open-orchestra-workflow-function-bundle": "1.1.1",
"open-orchestra/open-orchestra-cms-bundle": "1.1.*@dev",
"open-orchestra/open-orchestra-media-admin-bundle": "1.1.*@dev",
"open-orchestra/open-orchestra-model-bundle": "1.1.*@dev",
"open-orchestra/open-orchestra-base-api-mongo-model-bundle": "1.1.*@dev",
"open-orchestra/open-orchestra-elastica-bundle": "1.1.*@dev",
"open-orchestra/open-orchestra-workflow-function-bundle": "1.1.*@dev",
"innocead/captcha-bundle": "@dev",
"friendsofsymfony/user-bundle": "@dev"
"friendsofsymfony/user-bundle": "@dev",

"open-orchestra/open-orchestra-base-bundle": "@dev",
"open-orchestra/open-orchestra-bbcode-bundle": "@dev",
"open-orchestra/open-orchestra-libs": "@dev",
"open-orchestra/open-orchestra-base-api-bundle": "@dev",
"open-orchestra/open-orchestra-display-bundle": "@dev",
"open-orchestra/open-orchestra-user-bundle": "@dev",
"open-orchestra/open-orchestra-model-interface": "@dev",
"open-orchestra/open-orchestra-media-bundle": "@dev",
"open-orchestra/open-orchestra-media-file-bundle": "@dev",
"open-orchestra/open-orchestra-mongo-libs": "@dev"
},
"require-dev": {
"jmikola/geojson": "~1.0",
Expand Down
Loading

0 comments on commit 2e39560

Please sign in to comment.