Merge remote-tracking branch 'origin/master'

This commit is contained in:
Sergio Brighenti 2019-05-12 15:40:36 +02:00
commit 67c9d82931

2
composer.lock generated
View file

@ -1,7 +1,7 @@
{
"_readme": [
"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"
],
"content-hash": "120224d788960ba61ae3d0e49e173ad3",