Switch drush dev

webflo · webflo · commit fd47d6a033b8 · 2015-04-12T16:38:24.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,12 @@
-# OS specific temporary files
-.DS_Store*
-ehthumbs.db
-Thumbs.db
+# Ignore directories generated by Composer
+vendor
+web/core
+web/modules/contrib
+web/themes/contrib
+web/profiles/contrib
 
-# IDEs
-.buildpath
-.idea
-.project
-.settings
-*.esproj
-*.komodoproject
-*.komodotools
-nbproject
+# Ignore Drupal's file directory
+web/sites/default/files
 
-# Tools
-.svn
-.sass-cache
+# Ignore files generated by PhpStorm
+.idea
diff --git a/composer.json b/composer.json
@@ -18,16 +18,12 @@
         {
             "type": "composer",
             "url": "http://packagist.drupal-composer.org"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/webflo/drush.git"
         }
     ],
     "require": {
         "composer/installers": "^1.0.20",
-        "drupal/core": "8.0.x-dev",
-        "drush/drush": "dev-autoload",
+        "drupal/core": "8.0.*",
+        "drush/drush": "7.0.*",
 
         "drupal/devel": "8.1.*@dev",
         "drupal/token": "8.1.*@dev"
