Merge branch '2.x'

* 2.x: update branch alias Conflicts: composer.json
php-xapi · Apr 23, 2018 · ca80d0f · ca80d0f
2 parents 6fec00f + f9d9fee
commit ca80d0f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
     "extra": {
         "branch-alias": {
             "1.x-dev": "1.2.x-dev",
-            "2.x-dev": "2.1.x-dev",
+            "2.x-dev": "2.2.x-dev",
             "dev-master": "3.0.x-dev"
         }
     }