merge master in prod

2020-09-08 12:00:45 +02:00
parent b925edaa9e
commit 3e5e731c2c
226 changed files with 8516 additions and 4149 deletions
@@ -18,7 +18,7 @@
    "require": {
        "php": ">=5.3.3",
        "symfony/polyfill-mbstring": "^1.3",
-        "symfony/polyfill-php72": "^1.9"
+        "symfony/polyfill-php72": "^1.10"
    },
    "autoload": {
        "psr-4": { "Symfony\\Polyfill\\Intl\\Idn\\": "" },
@@ -30,7 +30,7 @@
    "minimum-stability": "dev",
    "extra": {
        "branch-alias": {
-            "dev-master": "1.9-dev"
+            "dev-master": "1.15-dev"
        }
    }
 }