Merge pull request #400 from derrabus/patch-1

Set the branch alias of master to 2.x-dev

Author: tobias-93

composer.json

@@ -34,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "2.x-dev"
         }
     }
 }