Merge branch '1.10'

2020-05-27 22:09:13 +02:00 · 2020-05-27 22:09:13 +02:00 · d8ada9e585
parent 0a3d87512d f7abfc9d7f
commit d8ada9e585
2 changed files with 2 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@ -27,7 +27,7 @@
        "composer/semver": "^3.0",
        "composer/spdx-licenses": "^1.2",
        "composer/xdebug-handler": "^1.1",
-        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+        "justinrainbow/json-schema": "^5.2.10",
        "psr/log": "^1.0",
        "seld/jsonlint": "^1.4",
        "seld/phar-utils": "^1.0",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "31f6c4b219ba3639c55066a1d1e0804e",
+    "content-hash": "b39e04ca4a44810c96876dae02629707",
    "packages": [
        {
            "name": "composer/ca-bundle",