lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from CachetHQ/2.4

Browse Source 
Update from upstream repo CachetHQ/Cachet
This commit is contained in:
Davide Bellini
2016-10-11 23:39:37 +02:00
committed by GitHub
parent e2441e7321 446e428486
commit cb639999d5
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+18 -18
View File
@@ -1646,16 +1646,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.2.1", "version": "6.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "3f808fba627f2c5b69e2501217bf31af349c1427" "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
"reference": "3f808fba627f2c5b69e2501217bf31af349c1427", "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1704,7 +1704,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2016-07-15 17:22:37" "time": "2016-10-08 15:01:37"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
@@ -2840,16 +2840,16 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.0.1", "version": "1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "5277094ed527a1c4477177d102fe4c53551953e0" "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0", "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"reference": "5277094ed527a1c4477177d102fe4c53551953e0", "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2883,7 +2883,7 @@
"psr", "psr",
"psr-3" "psr-3"
], ],
"time": "2016-09-19 16:02:08" "time": "2016-10-10 12:19:37"
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
@@ -4287,25 +4287,25 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.1.3", "version": "2.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "8828aaa2178e0a19325522e2a45282ff0a14649b" "reference": "3f5cbd0e6a2fc17bc40b0238025ef1ff4c8c3efa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/8828aaa2178e0a19325522e2a45282ff0a14649b", "url": "https://api.github.com/repos/filp/whoops/zipball/3f5cbd0e6a2fc17bc40b0238025ef1ff4c8c3efa",
"reference": "8828aaa2178e0a19325522e2a45282ff0a14649b", "reference": "3f5cbd0e6a2fc17bc40b0238025ef1ff4c8c3efa",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5.9" "php": "^5.5.9 || ^7.0"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "0.9.*", "mockery/mockery": "0.9.*",
"phpunit/phpunit": "^4.8 || ^5.0", "phpunit/phpunit": "^4.8 || ^5.0",
"symfony/var-dumper": "~3.0" "symfony/var-dumper": "^2.6 || ^3.0"
}, },
"suggest": { "suggest": {
"symfony/var-dumper": "Pretty print complex values better with var-dumper available", "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -4334,7 +4334,7 @@
} }
], ],
"description": "php error handling for cool kids", "description": "php error handling for cool kids",
"homepage": "https://github.com/filp/whoops", "homepage": "https://filp.github.io/whoops/",
"keywords": [ "keywords": [
"error", "error",
"exception", "exception",
@@ -4343,7 +4343,7 @@
"whoops", "whoops",
"zf2" "zf2"
], ],
"time": "2016-05-06 18:25:35" "time": "2016-10-11 15:32:23"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",