Commit b79c91a9 authored by Anton Smirnov's avatar Anton Smirnov
Browse files

Merge branch '1.x' 

# Conflicts:
#	composer.json
parents 9fa5b788 3a3fdbc4

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
        "psy/psysh": "*",

        "sandfox.dev/code-standard": "^1.2024.07.20",

        "squizlabs/php_codesniffer": "*",

        "vimeo/psalm": "^5 | ^6"

        "vimeo/psalm": "^5 || ^6"

    },

    "provide": {

        "psr/clock-implementation": "1.0"