Merge branch '5.1' into 5.x

* 5.1: fix merge [appveyor] fix checking for the .x branch Remove "branch-alias", populate "version"
symfony · Oct 6, 2020 · 9688dcf · 9688dcf
2 parents 4dfc0b2 + d9a6cf5
commit 9688dcf
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -37,9 +37,5 @@
         ]
     },
     "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "5.2-dev"
-        }
-    }
+    "version": "5.2-dev"
 }