Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2018-10-12 07:35:27 +02:00
commit 0cf7d57da7
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 1 additions and 1 deletions

Binary file not shown.

2
phpBB/composer.lock generated
View file

@ -1,7 +1,7 @@
{ {
"_readme": [ "_readme": [
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "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": "d4049e58bd7f34c266088eb78b8eb847", "content-hash": "d4049e58bd7f34c266088eb78b8eb847",