Merge pull request #16 from wp-cli/danielbachhuber-patch-1

Permit 1.x-dev as `dev-master`
wp-cli · Mar 30, 2017 · 64514f9 · 64514f9
2 parents 7d65b76 + 01bfaf2
commit 64514f9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.x-dev"
         },
         "commands": [
             "server"