Merge branch 'hotfix/branch-aliases'

weierophinney · weierophinney · commit 61e4513f1a6d · 2017-02-08T16:21:58.000-06:00
Updated branch aliases
diff --git a/composer.json b/composer.json
@@ -11,8 +11,8 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev",
-            "dev-develop": "1.1-dev"
+            "dev-master": "1.1-dev",
+            "dev-develop": "2.0-dev"
         }
     },
     "require": {
