Merge remote-tracking branch 'origin/2.4-develop' into bugfix/rest-ap…

…i-pagination # Conflicts: # app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
magento · Mar 7, 2020 · 68cf64d · 68cf64d
2 parents 6c171ce + 90012f2
commit 68cf64d
Show file tree

Hide file tree

Showing 199 changed files with 8,267 additions and 3,172 deletions.
diff --git a/.htaccess b/.htaccess
@@ -37,29 +37,6 @@
 
     DirectoryIndex index.php
 
-<IfModule mod_php5.c>
-############################################
-## adjust memory limit
-
-    php_value memory_limit 756M
-    php_value max_execution_time 18000
-
-############################################
-## disable automatic session start
-## before autoload was initialized
-
-    php_flag session.auto_start off
-
-############################################
-## enable resulting html compression
-
-    #php_flag zlib.output_compression on
-
-###########################################
-## disable user agent verification to not break multiple image upload
-
-    php_flag suhosin.session.cryptua off
-</IfModule>
 <IfModule mod_php7.c>
 ############################################
 ## adjust memory limit