Switched master branch to be the next future branch for 2.0

marc-mabe · marc-mabe · commit 8eb80b662f20 · 2014-09-12T08:54:47.000+02:00
diff --git a/composer.json b/composer.json
@@ -34,7 +34,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "2.0-dev",
+            "dev-1.x":    "1.2-dev"
         }
     }
 }
