Skip to content

Commit 07568d9

Browse files
YevSentYevSent
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into port-2618
2 parents b8ecd88 + 04fb965 commit 07568d9

File tree

43 files changed

+502
-58
lines changed

Some content is hidden

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

43 files changed

+502
-58
lines changed

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

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

‎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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
},
1313
"type": "magento2-test",
1414
"license": [
15-
"proprietary"
15+
"OSL-3.0",
16+
"AFL-3.0"
1617
]
1718
}

‎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/AsynchronousOperations/Test/Mftf/composer.json

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

‎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/Authorizenet/Test/Mftf/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
},
2121
"type": "magento2-test",
2222
"license": [
23-
"proprietary"
23+
"OSL-3.0",
24+
"AFL-3.0"
2425
]
2526
}

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

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

‎app/code/Magento/Braintree/Test/Mftf/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
},
2929
"type": "magento2-test",
3030
"license": [
31-
"proprietary"
31+
"OSL-3.0",
32+
"AFL-3.0"
3233
]
3334
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
},
3030
"type": "magento2-module",
3131
"license": [
32-
"proprietary"
32+
"OSL-3.0",
33+
"AFL-3.0"
3334
],
3435
"autoload": {
3536
"files": [

0 commit comments

Comments
 (0)