Commit 0a7f3769 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/master' into php84 

# Conflicts:
#	composer.json
parents 6c968043 fbc93c62

composer.json

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
        }

    ],

    "require": {

        "unicaen/app": ">=5.0|dev-php84",

	    "unicaen/utilisateur": "^6.2|dev-php84"

        "unicaen/app": ">=5.0",

	    "unicaen/utilisateur": ">=6.2"

    },

    "require-dev": {

        "phpunit/phpunit": ">=3.7"