Skip to content
Snippets Groups Projects
Commit 2dbf7825 authored by Andrii Voskoboinikov's avatar Andrii Voskoboinikov
Browse files

Merge branch '2.2-develop' of https://github.com/magento/magento2ce into MAGETWO-81090

parents 96b4755b 4d4e88a8
Branches
No related merge requests found
Showing
with 264 additions and 20 deletions
......@@ -346,6 +346,15 @@
Require all denied
</IfVersion>
</Files>
<Files auth.json>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files magento_umask>
<IfVersion < 2.4>
order allow,deny
......
......@@ -323,6 +323,15 @@
Require all denied
</IfVersion>
</Files>
<Files auth.json>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files magento_umask>
<IfVersion < 2.4>
order allow,deny
......
This diff is collapsed.
......@@ -11,7 +11,7 @@
"lib-libxml": "*"
},
"type": "magento2-module",
"version": "100.2.0",
"version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -4,10 +4,10 @@
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-backend": "100.2.*",
"magento/module-config": "100.2.*",
"magento/module-config": "101.0.*",
"magento/module-integration": "100.2.*",
"magento/module-store": "100.2.*",
"magento/framework": "100.2.*"
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
......
......@@ -24,7 +24,7 @@
"magento/module-theme": "100.2.*"
},
"type": "magento2-module",
"version": "100.2.1",
"version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -9,7 +9,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
"version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -48,7 +48,7 @@ class BraintreeAdapter
* Initializes credentials.
*
* @return void
* @deprecated is not used anymore
* @deprecated 100.2.2 is not used anymore
*/
protected function initCredentials()
{
......
......@@ -18,14 +18,14 @@
"magento/module-quote": "101.0.*",
"magento/module-paypal": "100.2.*",
"magento/module-ui": "101.0.*",
"braintree/braintree_php": "3.22.0"
"braintree/braintree_php": "3.25.0"
},
"suggest": {
"magento/module-checkout-agreements": "100.2.*",
"magento/module-theme": "100.2.*"
},
"type": "magento2-module",
"version": "100.2.1",
"version": "100.2.2",
"license": [
"proprietary"
],
......
......@@ -25,7 +25,7 @@
"magento/module-bundle-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
"version": "100.2.1",
"version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -34,7 +34,7 @@
"magento/module-catalog-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
"version": "102.0.1",
"version": "102.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -3,8 +3,8 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/framework": "100.2.*",
"magento/module-catalog": "101.1.*"
"magento/framework": "101.0.*",
"magento/module-catalog": "102.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
......
......@@ -16,7 +16,7 @@
"ext-ctype": "*"
},
"type": "magento2-module",
"version": "100.2.1",
"version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -13,7 +13,7 @@
"magento/module-ui": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.1",
"version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -17,7 +17,7 @@
"magento/module-catalog-rule-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
"version": "101.0.1",
"version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -15,7 +15,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.1",
"version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -14,7 +14,7 @@
"magento/module-ui": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.1",
"version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -27,7 +27,7 @@
"magento/module-cookie": "100.2.*"
},
"type": "magento2-module",
"version": "100.2.1",
"version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -18,7 +18,7 @@
"magento/module-cms-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
"version": "102.0.1",
"version": "102.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
......@@ -13,7 +13,7 @@
"magento/module-deploy": "100.2.*"
},
"type": "magento2-module",
"version": "101.0.1",
"version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment