Merge branch '3.4' into 4.4

* 3.4: Remove "branch-alias", populate "version"
symfony · Oct 6, 2020 · 2b0a4ab · 2b0a4ab
1 parent 84e23fd
commit 2b0a4ab
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -27,12 +27,10 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-alias": {
-            "dev-master": "1.1-dev"
-        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    }
+    },
+    "version": "1.1-dev"
 }