Pull merge.

[yaffs-website] / vendor / symfony / polyfill-iconv / composer.json

diff --git a/vendor/symfony/polyfill-iconv/composer.json b/vendor/symfony/polyfill-iconv/composer.json
index f83afbd5f34403056fdec5ba679a061a97c53bcb..816e6bd7ffe11f0c4273be2e3d472605782bb9af 100644 (file)
--- a/vendor/symfony/polyfill-iconv/composer.json
+++ b/vendor/symfony/polyfill-iconv/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.4-dev"
+            "dev-master": "1.9-dev"
         }
     }
 }