Skip to content

Commit 22c39ec

Browse files
committed
Merge remote-tracking branch 'pub/develop' into MAGETWO-33534
2 parents 6e10500 + c06accc commit 22c39ec

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

.htaccess

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
############################################
3737
## adjust memory limit
3838

39-
# php_value memory_limit 64M
4039
php_value memory_limit 768M
4140
php_value max_execution_time 18000
4241

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ After verifying your prerequisites, perform the following tasks in order to prep
6161
<h2>Contributing to the Magento 2 code base</h2>
6262
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.
6363

64-
To make learn about how to make a contribution, click [here][1].
64+
To learn about how to make a contribution, click [here][1].
6565

6666
To learn about issues, click [here][2]. To open an issue, click [here][3].
6767

pub/.htaccess

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
############################################
3737
## adjust memory limit
3838

39-
# php_value memory_limit 64M
4039
php_value memory_limit 256M
4140
php_value max_execution_time 18000
4241

0 commit comments

Comments
 (0)