Skip to content

Commit b9d5009

Browse files
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-52248
2 parents fc3e2bf + c790670 commit b9d5009

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"colinmollenhour/php-redis-session-abstract": "1.1",
3737
"composer/composer": "1.0.0-beta1",
3838
"monolog/monolog": "1.16.0",
39-
"oyejorge/less.php": "1.7.0.3",
39+
"oyejorge/less.php": "~1.7.0",
4040
"pelago/emogrifier": "0.1.1",
4141
"tubalmartin/cssmin": "2.4.8-p4",
4242
"magento/magento-composer-installer": "*",

composer.lock

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

0 commit comments

Comments
 (0)