Merge remote-tracking branch 'origin/MAGETWO-32612-magento-composer-uninstall-not-removing-module' into develop

Olga Kopylova · Olga Kopylova · commit d2ef9dac9e3f · 2015-03-10T10:06:08.000-05:00
diff --git a/app/etc/vendor_path.php b/app/etc/vendor_path.php
@@ -1,10 +1,5 @@
 <?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
 /**
  * Path to Composer vendor directory
  */
-return 'vendor';
+return './vendor';
diff --git a/composer.json b/composer.json
@@ -32,7 +32,8 @@
         "magento/zendframework1": "1.12.10",
         "composer/composer": "1.0.0-alpha8",
         "monolog/monolog": "1.11.0",
-        "tubalmartin/cssmin": "2.4.8-p4"
+        "tubalmartin/cssmin": "2.4.8-p4",
+        "magento/magento-composer-installer": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.0",
diff --git a/composer.lock b/composer.lock
