Merge branch '4.0-dev' into hash_based_csp

joomla · Jul 27, 2019 · ac01119 · ac01119
2 parents 3ddbd4b + af17679
commit ac01119
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 67 deletions.
diff --git a/composer.json b/composer.json
@@ -81,7 +81,7 @@
         "joomla/string": "~2.0@dev",
         "joomla/uri": "~2.0@dev",
         "joomla/utilities": "~2.0@dev",
-        "algo26-matthias/idna-convert": "~1.1",
+        "algo26-matthias/idna-convert": "~3.0",
         "defuse/php-encryption": "~2.1",
         "doctrine/inflector": "1.2.0",
         "fig/link-util": "~1.0",