Merge pull request #52 from magento-ogre/MAGETWO-31998-ce-base

[Ogres] Added Composer Test
magento · Jan 22, 2015 · 46c48d3 · 46c48d3
2 parents cc38a64 + ab2087d
commit 46c48d3
Show file tree

Hide file tree

Showing 5 changed files with 491 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -143,7 +143,6 @@
         "magento/language-pt_br": "self.version",
         "magento/language-zh_cn": "self.version",
         "magento/framework": "self.version",
-        "magento/project-setup": "0.1.0",
         "oyejorge/less.php": "1.7.0",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "components/handlebars.js": "1.3.0",

diff --git a/composer.lock b/composer.lock