Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dev/1.2' into 1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
orocrmdeployer committed Jun 20, 2017
2 parents 61f266f + 245af2e commit 53ba6cb
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 180 deletions.
42 changes: 21 additions & 21 deletions dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,27 @@
"exclude-from-classmap": ["**/Tests/"]
},
"require": {
"oro/commerce": "1.x-dev",
"oro/platform": "2.x-dev",
"oro/platform-serialised-fields": "2.x-dev",
"oro/calendar-bundle": "2.x-dev",
"oro/marketing": "2.x-dev",
"oro/customer-portal": "2.x-dev",
"oro/commerce-wirecard": "1.x-dev",
"oro/crm": "2.x-dev",
"oro/crm-task-bundle": "2.x-dev",
"oro/crm-call-bundle": "2.x-dev",
"oro/commerce-crm": "1.x-dev",
"oro/crm-hangouts-call-bundle": "2.x-dev",
"oro/crm-abandoned-cart": "2.x-dev",
"oro/crm-magento-embedded-contact-us": "2.x-dev",
"oro/crm-mail-chimp": "2.x-dev",
"oro/crm-dotmailer": "2.x-dev",
"oro/crm-zendesk": "2.x-dev",
"oro/commerce-apruve": "1.x-dev",
"oro/commerce-dpd": "1.x-dev",
"oro/commerce-infinitepay": "1.x-dev",
"oro/german-localization": "1.x-dev"
"oro/commerce": "1.2.x-dev",
"oro/platform": "2.2.x-dev",
"oro/platform-serialised-fields": "2.2.x-dev",
"oro/calendar-bundle": "2.2.x-dev",
"oro/marketing": "2.2.x-dev",
"oro/customer-portal": "2.2.x-dev",
"oro/commerce-wirecard": "1.2.x-dev",
"oro/crm": "2.2.x-dev",
"oro/crm-task-bundle": "2.2.x-dev",
"oro/crm-call-bundle": "2.2.x-dev",
"oro/commerce-crm": "1.2.x-dev",
"oro/crm-hangouts-call-bundle": "2.2.x-dev",
"oro/crm-abandoned-cart": "2.2.x-dev",
"oro/crm-magento-embedded-contact-us": "2.2.x-dev",
"oro/crm-mail-chimp": "2.2.x-dev",
"oro/crm-dotmailer": "2.2.x-dev",
"oro/crm-zendesk": "2.2.x-dev",
"oro/commerce-apruve": "1.2.x-dev",
"oro/commerce-dpd": "1.2.x-dev",
"oro/commerce-infinitepay": "1.2.x-dev",
"oro/german-localization": "2.2.x-dev"
},
"require-dev": {
"sensio/generator-bundle": "3.1.2",
Expand Down
Loading

0 comments on commit 53ba6cb

Please sign in to comment.