Merge remote-tracking branch 'pub/develop' into MAGETWO-33534

magento · Jun 5, 2015 · 22c39ec · 22c39ec
2 parents 6e10500 + c06accc
commit 22c39ec
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/.htaccess b/.htaccess
@@ -36,7 +36,6 @@
 ############################################
 ## adjust memory limit
 
-#    php_value memory_limit 64M
     php_value memory_limit 768M
     php_value max_execution_time 18000
 

diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ After verifying your prerequisites, perform the following tasks in order to prep
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
 
-To make learn about how to make a contribution, click [here][1].
+To learn about how to make a contribution, click [here][1].
 
 To learn about issues, click [here][2]. To open an issue, click [here][3].
 

diff --git a/pub/.htaccess b/pub/.htaccess
@@ -36,7 +36,6 @@
 ############################################
 ## adjust memory limit
 
-#    php_value memory_limit 64M
     php_value memory_limit 256M
     php_value max_execution_time 18000