Merge branch 'ticket/16632' into ticket/16632-master

This commit is contained in:
Marc Alexander 2020-11-13 22:31:52 +01:00
commit fbee356d9c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 2 deletions

View file

@ -31,7 +31,7 @@
"bantu/ini-get-wrapper": "~1.0", "bantu/ini-get-wrapper": "~1.0",
"composer/composer": "^2.0", "composer/composer": "^2.0",
"composer/installers": "^1.9", "composer/installers": "^1.9",
"composer/package-versions-deprecated": "1.11.99.1", "composer/package-versions-deprecated": "^1.11",
"google/recaptcha": "~1.1", "google/recaptcha": "~1.1",
"guzzlehttp/guzzle": "~6.3", "guzzlehttp/guzzle": "~6.3",
"lusitanian/oauth": "^0.8.1", "lusitanian/oauth": "^0.8.1",

2
phpBB/composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "4281844db378da9d93a5441c74554cdf", "content-hash": "b38b54a0e735586afaf2788716cc2535",
"packages": [ "packages": [
{ {
"name": "bantu/ini-get-wrapper", "name": "bantu/ini-get-wrapper",