Merge branch 'version/bump'

Bump composer.json branch aliases
AntonStoeckl · May 1, 2013 · 221f185 · 221f185
2 parents 05ca2ef + eb3e1a8
commit 221f185
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -90,8 +90,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev",
-            "dev-develop": "2.2-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         }
     }
 }