Merge branch 'hotfix/composer-alias'

adoweb · Jan 29, 2013 · ee45d7b · ee45d7b
2 parents 0aad092 + 91bddc1
commit ee45d7b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -85,8 +85,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev",
-            "dev-develop": "2.1-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     }
 }