Merge branch 'master' of github.com:CachetHQ/Cachet

This commit is contained in:
James Brooks
2016-03-08 12:57:01 +00:00

20
composer.lock generated
View File

@@ -1392,16 +1392,16 @@
},
{
"name": "guzzlehttp/promises",
"version": "1.0.3",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea"
"reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea",
"reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea",
"url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8",
"reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8",
"shasum": ""
},
"require": {
@@ -1439,7 +1439,7 @@
"keywords": [
"promise"
],
"time": "2015-10-15 22:28:00"
"time": "2016-03-08 01:15:46"
},
{
"name": "guzzlehttp/psr7",
@@ -1899,16 +1899,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.17",
"version": "1.0.18",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "02f5b6c9a8b9278c8381e3361e7bd9d641c740ca"
"reference": "b334d6c5f95364948e06d2f620ab93d084074c6e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/02f5b6c9a8b9278c8381e3361e7bd9d641c740ca",
"reference": "02f5b6c9a8b9278c8381e3361e7bd9d641c740ca",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b334d6c5f95364948e06d2f620ab93d084074c6e",
"reference": "b334d6c5f95364948e06d2f620ab93d084074c6e",
"shasum": ""
},
"require": {
@@ -1978,7 +1978,7 @@
"sftp",
"storage"
],
"time": "2016-02-19 15:35:38"
"time": "2016-03-07 21:01:43"
},
{
"name": "mccool/laravel-auto-presenter",