Merge remote-tracking branch 'origin/master'

This commit is contained in:
Sergio Brighenti 2019-01-20 22:39:19 +01:00
commit fe19e9dede

12
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": "3ffe3637bbcca9dc78923aca4ffdbbe6",
@ -620,16 +620,16 @@
},
{
"name": "slim/slim",
"version": "3.11.0",
"version": "3.12.0",
"source": {
"type": "git",
"url": "https://github.com/slimphp/Slim.git",
"reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a"
"reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
"reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
"url": "https://api.github.com/repos/slimphp/Slim/zipball/f4947cc900b6e51cbfda58b9f1247bca2f76f9f0",
"reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0",
"shasum": ""
},
"require": {
@ -687,7 +687,7 @@
"micro",
"router"
],
"time": "2018-09-16T10:54:21+00:00"
"time": "2019-01-15T13:21:25+00:00"
},
{
"name": "slim/twig-view",