Commit 9d8bc3d0 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'develop'

parents 1fa199bd 8784e6a8
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@
        }
    ],
    "require":      {
    "php": ">=7.2",
        "php":               "7.3.*",
        "unicaen/app":       "^3.0",
        "doctrine/dbal":     "^2.9",
        "beberlei/assert":   "^2.7",
        "ramsey/uuid":       "^3.6",
    "unicaen/app": "dev-zf-3.x",
        "guzzlehttp/guzzle": "^6.3"
    },
    "require-dev":  {
    "phpunit/phpunit": "~5.4",
    "unicaen/test": "dev-zf-3.x"
        "unicaen/test":    "^3.0",
        "phpunit/phpunit": "~5.4"
    },
    "autoload":     {
        "psr-0":    {
+392 −333

File changed.

Preview size limit exceeded, changes collapsed.