Skip to content

Commit ca70bd8

Browse files
committed
Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MAGETWO-91808
2 parents 846f720 + c4d2ef4 commit ca70bd8

File tree

187 files changed

+1133
-3309
lines changed

Some content is hidden

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

187 files changed

+1133
-3309
lines changed

app/code/Magento/AdminNotification/Test/Mftf/composer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/code/Magento/AdvancedSearch/Test/Mftf/composer.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

app/code/Magento/AdvancedSearch/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"type": "magento2-module",
1919
"license": [
20-
"proprietary"
20+
"OSL-3.0",
21+
"AFL-3.0"
2122
],
2223
"autoload": {
2324
"files": [

app/code/Magento/Amqp/Test/Mftf/composer.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/code/Magento/Amqp/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
},
1313
"type": "magento2-module",
1414
"license": [
15-
"proprietary"
15+
"OSL-3.0",
16+
"AFL-3.0"
1617
],
1718
"autoload": {
1819
"files": [

app/code/Magento/Analytics/Test/Mftf/composer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json

Lines changed: 0 additions & 24 deletions
This file was deleted.

app/code/Magento/AsynchronousOperations/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
},
2020
"type": "magento2-module",
2121
"license": [
22-
"proprietary"
22+
"OSL-3.0",
23+
"AFL-3.0"
2324
],
2425
"autoload": {
2526
"files": [

app/code/Magento/Authorization/Test/Mftf/composer.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)