Merge branch 'v1.0'

jmikola · jmikola · commit 97ad0082d705 · 2016-03-14T10:55:04.000-04:00
diff --git a/composer.json b/composer.json
@@ -19,10 +19,5 @@
     },
     "autoload-dev": {
         "psr-4": { "MongoDB\\Tests\\": "tests/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
     }
 }
