Merge branch 'stable' into next-minor

This commit is contained in:
Dylan K. Taylor
2020-04-25 12:06:52 +01:00
12 changed files with 932 additions and 208 deletions

6
composer.lock generated
View File

@ -475,11 +475,11 @@
"packages-dev": [
{
"name": "irstea/phpunit-shim",
"version": "8.5.3",
"version": "8.5.4",
"source": {
"type": "git",
"url": "https://gitlab.irstea.fr/pole-is/tools/phpunit-shim.git",
"reference": "b55d058d7ad3cf516068f22138a5b8fb724605db"
"reference": "25b3ffe1502bfd35d5cd23dc37f2f2e70cdf0b54"
},
"require": {
"ext-dom": "*",
@ -525,7 +525,7 @@
"testing",
"xunit"
],
"time": "2020-04-01T02:21:12+00:00"
"time": "2020-04-24T02:20:21+00:00"
},
{
"name": "phpstan/phpstan",