fix merge

symfony · Oct 22, 2019 · ff6078e · ff6078e
1 parent 077f7be
commit ff6078e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -113,6 +113,7 @@
         "monolog/monolog": "^1.25.1|^2",
         "nyholm/psr7": "^1.0",
         "ocramius/proxy-manager": "^2.1",
+        "paragonie/sodium_compat": "^1.8",
         "php-http/httplug": "^1.0|^2.0",
         "predis/predis": "~1.1",
         "psr/http-client": "^1.0",

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -61,6 +61,7 @@
         "symfony/property-info": "^4.4|^5.0",
         "symfony/web-link": "^4.4|^5.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0",
+        "paragonie/sodium_compat": "^1.8",
         "twig/twig": "^2.10|^3.0"
     },
     "conflict": {