Skip to content

Commit 0ec059d

Browse files
author
Olga Kopylova
committed
Merge remote-tracking branch 'origin/MAGETWO-39005-mbstring-dependency' into PR_Branch
Conflicts: composer.lock
2 parents a8b5c8c + ff7c06d commit 0ec059d

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"ext-iconv": "*",
5656
"ext-intl": "*",
5757
"ext-xsl": "*",
58+
"ext-mbstring": "*",
5859
"sjparkinson/static-review": "~4.1",
5960
"fabpot/php-cs-fixer": "~1.2",
6061
"lusitanian/oauth": "~0.3"

composer.lock

Lines changed: 14 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)