Merge pull request #16 from alexander-schranz/enhancement/branch-alias

Update branch alias to match newest 1.x version

Author: dantleech

composer.json

@@ -36,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.x-dev"
         }
     }
 }