Merge branch '3.4' into 4.4

* 3.4: Remove branch-version (keep them for contracts only) [Serializer] fix decoding float XML attributes starting with 0 add missing dutch translations [Validator] Add missing romanian translations do not translate null placeholders or titles
Remove branch-version (keep them for contracts only)
2026-03-25 09:42:20 +01:00 · 2020-10-24 13:50:19 +02:00 · 2020-10-24 12:57:07 +02:00 · 2020-10-13 15:20:53 +02:00 · 2020-10-13 15:20:16 +02:00 · 2020-10-13 14:30:56 +02:00
1 changed files with 1 additions and 6 deletions
--- a/composer.json
+++ b/composer.json
@@ -32,10 +32,5 @@
            "/Tests/"
        ]
    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "4.4-dev"
-        }
-    }
+    "minimum-stability": "dev"
 }
Author	SHA1	Message	Date
Nicolas Grekas	c87adf3fc1	Merge branch '3.4' into 4.4 * 3.4: Remove branch-version (keep them for contracts only) [Serializer] fix decoding float XML attributes starting with 0 add missing dutch translations [Validator] Add missing romanian translations do not translate null placeholders or titles	2020-10-24 13:50:19 +02:00
Nicolas Grekas	ab42889de5	Remove branch-version (keep them for contracts only)	2020-10-24 12:57:07 +02:00
Nicolas Grekas	ba95c0aa9b	Merge branch '3.4' into 4.4 * 3.4: Fix branch-version	2020-10-13 15:20:53 +02:00
Nicolas Grekas	bfcf449c91	Fix branch-version	2020-10-13 15:20:16 +02:00
Nicolas Grekas	5a40526df8	Merge branch '3.4' into 4.4 * 3.4: Remove "version" from composer.json files, use "branch-version" instead	2020-10-13 14:30:56 +02:00
Nicolas Grekas	90c931ffd0	Remove "version" from composer.json files, use "branch-version" instead	2020-10-13 14:21:16 +02:00
Nicolas Grekas	888525fe28	Merge branch '3.4' into 4.4 * 3.4: Update versions in composer.json	2020-10-06 17:45:41 +02:00
Nicolas Grekas	34a8785ac1	Update versions in composer.json	2020-10-06 17:25:25 +02:00
Nicolas Grekas	434a1f80c9	Merge branch '3.4' into 4.4 * 3.4: Remove "branch-alias", populate "version"	2020-10-06 13:41:17 +02:00
Nicolas Grekas	0a7f96d51e	Remove "branch-alias", populate "version"	2020-10-06 13:22:52 +02:00
Alexander M. Turek	9109e4414e	[Debug] Skip a test that was meant for HHVM.	2020-09-09 00:19:14 +02:00