Merge branch 'master' into master

pull/290/head
Felix Becker 2018-04-26 16:58:08 -07:00 committed by GitHub
commit 538aaf33db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions

10
composer.lock generated
View File

@ -267,16 +267,16 @@
},
{
"name": "composer/xdebug-handler",
"version": "1.0.0",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
"reference": "1852e549ad0d6f2910f89c27fec833dda1b25b4a"
"reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1852e549ad0d6f2910f89c27fec833dda1b25b4a",
"reference": "1852e549ad0d6f2910f89c27fec833dda1b25b4a",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/c919dc6c62e221fc6406f861ea13433c0aa24f08",
"reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08",
"shasum": ""
},
"require": {
@ -307,7 +307,7 @@
"Xdebug",
"performance"
],
"time": "2018-03-08T13:09:50+00:00"
"time": "2018-04-11T15:42:36+00:00"
},
{
"name": "felixfbecker/advanced-json-rpc",