Skip to content

Commit

Permalink
Merge pull request #577 from magento-webdev/MAGETWO-50528
Browse files Browse the repository at this point in the history
[WebDev] MAGETWO-50528
  • Loading branch information
VladimirZaets committed Apr 29, 2016
2 parents 2b0d791 + dfea096 commit c790670
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"colinmollenhour/php-redis-session-abstract": "1.1",
"composer/composer": "1.0.0-beta1",
"monolog/monolog": "1.16.0",
"oyejorge/less.php": "1.7.0.3",
"oyejorge/less.php": "~1.7.0",
"pelago/emogrifier": "0.1.1",
"tubalmartin/cssmin": "2.4.8-p4",
"magento/magento-composer-installer": "*",
Expand Down
41 changes: 22 additions & 19 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c790670

Please sign in to comment.