Skip to content

Commit eb2d68c

Browse files
Merge remote-tracking branch 'remotes/dev/3.1' into 3.1
2 parents f991536 + 47b2606 commit eb2d68c

File tree

4 files changed

+244
-466
lines changed

4 files changed

+244
-466
lines changed

composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
"oro/crm": "3.1.*",
2828
"oro/platform-serialised-fields": "3.1.*",
2929
"oro/crm-hangouts-call-bundle": "3.1.*",
30-
"oro/crm-abandoned-cart": "3.1.*",
3130
"oro/crm-magento-embedded-contact-us": "3.1.*",
32-
"oro/crm-mail-chimp": "3.1.*",
3331
"oro/crm-dotmailer": "3.1.*",
3432
"oro/crm-zendesk": "3.1.*",
3533
"oro/commerce": "3.1.*",
@@ -45,7 +43,7 @@
4543
"phpunit/phpunit": "6.5.*",
4644
"johnkary/phpunit-speedtrap": "2.0.*",
4745
"mybuilder/phpunit-accelerator": "2.0.*",
48-
"squizlabs/php_codesniffer": "2.8.*",
46+
"squizlabs/php_codesniffer": "3.3.*",
4947
"phpmd/phpmd": "2.6.*",
5048
"sebastian/phpcpd": "3.0.*",
5149
"phpunit/phpcov": "4.0.*",

dev.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
"oro/crm-call-bundle": "3.1.*",
3535
"oro/commerce-crm": "3.1.*",
3636
"oro/crm-hangouts-call-bundle": "3.1.*",
37-
"oro/crm-abandoned-cart": "3.1.*",
3837
"oro/crm-magento-embedded-contact-us": "3.1.*",
39-
"oro/crm-mail-chimp": "3.1.*",
4038
"oro/crm-dotmailer": "3.1.*",
4139
"oro/crm-zendesk": "3.1.*",
4240
"oro/commerce-infinitepay": "3.1.*",

0 commit comments

Comments
 (0)