Skip to content

Commit 7e3e1d3

Browse files
author
Denys Rudchenko
committed
Merge remote-tracking branch 'mainline-ce/develop' into nord_develop
Conflicts: app/code/Magento/GoogleShopping/composer.json composer.lock
2 parents 8bda8b6 + a1472e2 commit 7e3e1d3

File tree

208 files changed

+6323
-1697
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+6323
-1697
lines changed

‎CHANGELOG.md

Lines changed: 119 additions & 78 deletions
Large diffs are not rendered by default.

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta15",
7-
"magento/module-backend": "0.74.0-beta15",
8-
"magento/module-media-storage": "0.74.0-beta15",
9-
"magento/framework": "0.74.0-beta15",
6+
"magento/module-store": "0.74.0-beta16",
7+
"magento/module-backend": "0.74.0-beta16",
8+
"magento/module-media-storage": "0.74.0-beta16",
9+
"magento/framework": "0.74.0-beta16",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta15",
14+
"version": "0.74.0-beta16",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-catalog": "0.74.0-beta15",
7-
"magento/module-catalog-inventory": "0.74.0-beta15",
8-
"magento/module-eav": "0.74.0-beta15",
9-
"magento/module-import-export": "0.74.0-beta15",
10-
"magento/module-catalog-import-export": "0.74.0-beta15",
11-
"magento/module-customer": "0.74.0-beta15",
12-
"magento/module-store": "0.74.0-beta15",
13-
"magento/framework": "0.74.0-beta15",
6+
"magento/module-catalog": "0.74.0-beta16",
7+
"magento/module-catalog-inventory": "0.74.0-beta16",
8+
"magento/module-eav": "0.74.0-beta16",
9+
"magento/module-import-export": "0.74.0-beta16",
10+
"magento/module-catalog-import-export": "0.74.0-beta16",
11+
"magento/module-customer": "0.74.0-beta16",
12+
"magento/module-store": "0.74.0-beta16",
13+
"magento/framework": "0.74.0-beta16",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "0.74.0-beta15",
17+
"version": "0.74.0-beta16",
1818
"license": [
1919
"OSL-3.0",
2020
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta15",
7-
"magento/framework": "0.74.0-beta15",
6+
"magento/module-backend": "0.74.0-beta16",
7+
"magento/framework": "0.74.0-beta16",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta15",
11+
"version": "0.74.0-beta16",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta15",
7-
"magento/module-directory": "0.74.0-beta15",
8-
"magento/module-developer": "0.74.0-beta15",
9-
"magento/module-eav": "0.74.0-beta15",
10-
"magento/module-cron": "0.74.0-beta15",
11-
"magento/module-theme": "0.74.0-beta15",
12-
"magento/module-reports": "0.74.0-beta15",
13-
"magento/module-sales": "0.74.0-beta15",
14-
"magento/module-quote": "0.74.0-beta15",
15-
"magento/module-catalog": "0.74.0-beta15",
16-
"magento/module-user": "0.74.0-beta15",
17-
"magento/module-backup": "0.74.0-beta15",
18-
"magento/module-customer": "0.74.0-beta15",
19-
"magento/module-translation": "0.74.0-beta15",
20-
"magento/module-require-js": "0.74.0-beta15",
21-
"magento/module-config": "0.74.0-beta15",
22-
"magento/framework": "0.74.0-beta15",
6+
"magento/module-store": "0.74.0-beta16",
7+
"magento/module-directory": "0.74.0-beta16",
8+
"magento/module-developer": "0.74.0-beta16",
9+
"magento/module-eav": "0.74.0-beta16",
10+
"magento/module-cron": "0.74.0-beta16",
11+
"magento/module-theme": "0.74.0-beta16",
12+
"magento/module-reports": "0.74.0-beta16",
13+
"magento/module-sales": "0.74.0-beta16",
14+
"magento/module-quote": "0.74.0-beta16",
15+
"magento/module-catalog": "0.74.0-beta16",
16+
"magento/module-user": "0.74.0-beta16",
17+
"magento/module-backup": "0.74.0-beta16",
18+
"magento/module-customer": "0.74.0-beta16",
19+
"magento/module-translation": "0.74.0-beta16",
20+
"magento/module-require-js": "0.74.0-beta16",
21+
"magento/module-config": "0.74.0-beta16",
22+
"magento/framework": "0.74.0-beta16",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta15",
26+
"version": "0.74.0-beta16",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backup/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta15",
7-
"magento/module-backend": "0.74.0-beta15",
8-
"magento/module-cron": "0.74.0-beta15",
9-
"magento/framework": "0.74.0-beta15",
6+
"magento/module-store": "0.74.0-beta16",
7+
"magento/module-backend": "0.74.0-beta16",
8+
"magento/module-cron": "0.74.0-beta16",
9+
"magento/framework": "0.74.0-beta16",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta15",
13+
"version": "0.74.0-beta16",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta15",
7-
"magento/module-catalog": "0.74.0-beta15",
8-
"magento/module-tax": "0.74.0-beta15",
9-
"magento/module-backend": "0.74.0-beta15",
10-
"magento/module-sales": "0.74.0-beta15",
11-
"magento/module-checkout": "0.74.0-beta15",
12-
"magento/module-catalog-inventory": "0.74.0-beta15",
13-
"magento/module-customer": "0.74.0-beta15",
14-
"magento/module-catalog-rule": "0.74.0-beta15",
15-
"magento/module-eav": "0.74.0-beta15",
16-
"magento/module-config": "0.74.0-beta15",
17-
"magento/module-gift-message": "0.74.0-beta15",
18-
"magento/framework": "0.74.0-beta15",
19-
"magento/module-quote": "0.74.0-beta15",
20-
"magento/module-media-storage": "0.74.0-beta15",
6+
"magento/module-store": "0.74.0-beta16",
7+
"magento/module-catalog": "0.74.0-beta16",
8+
"magento/module-tax": "0.74.0-beta16",
9+
"magento/module-backend": "0.74.0-beta16",
10+
"magento/module-sales": "0.74.0-beta16",
11+
"magento/module-checkout": "0.74.0-beta16",
12+
"magento/module-catalog-inventory": "0.74.0-beta16",
13+
"magento/module-customer": "0.74.0-beta16",
14+
"magento/module-catalog-rule": "0.74.0-beta16",
15+
"magento/module-eav": "0.74.0-beta16",
16+
"magento/module-config": "0.74.0-beta16",
17+
"magento/module-gift-message": "0.74.0-beta16",
18+
"magento/framework": "0.74.0-beta16",
19+
"magento/module-quote": "0.74.0-beta16",
20+
"magento/module-media-storage": "0.74.0-beta16",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta15"
24+
"magento/module-webapi": "0.74.0-beta16"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta15",
27+
"version": "0.74.0-beta16",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/BundleImportExport/composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-catalog": "0.74.0-beta15",
7-
"magento/module-import-export": "0.74.0-beta15",
8-
"magento/module-catalog-import-export": "0.74.0-beta15",
9-
"magento/module-bundle": "0.74.0-beta15",
10-
"magento/module-eav": "0.74.0-beta15",
11-
"magento/framework": "0.74.0-beta15",
6+
"magento/module-catalog": "0.74.0-beta16",
7+
"magento/module-import-export": "0.74.0-beta16",
8+
"magento/module-catalog-import-export": "0.74.0-beta16",
9+
"magento/module-bundle": "0.74.0-beta16",
10+
"magento/module-eav": "0.74.0-beta16",
11+
"magento/framework": "0.74.0-beta16",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.74.0-beta15",
15+
"version": "0.74.0-beta16",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

‎app/code/Magento/CacheInvalidate/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-page-cache": "0.74.0-beta15",
7-
"magento/framework": "0.74.0-beta15",
6+
"magento/module-page-cache": "0.74.0-beta16",
7+
"magento/framework": "0.74.0-beta16",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta15",
11+
"version": "0.74.0-beta16",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Captcha/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta15",
7-
"magento/module-customer": "0.74.0-beta15",
8-
"magento/module-checkout": "0.74.0-beta15",
9-
"magento/module-backend": "0.74.0-beta15",
10-
"magento/framework": "0.74.0-beta15",
6+
"magento/module-store": "0.74.0-beta16",
7+
"magento/module-customer": "0.74.0-beta16",
8+
"magento/module-checkout": "0.74.0-beta16",
9+
"magento/module-backend": "0.74.0-beta16",
10+
"magento/framework": "0.74.0-beta16",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta15",
14+
"version": "0.74.0-beta16",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

0 commit comments

Comments
 (0)