Merge branch '2.3'

This commit is contained in:
Graham Campbell
2016-07-13 18:28:48 -07:00

10
composer.lock generated
View File

@@ -325,16 +325,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.18.27",
"version": "3.18.28",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "8cc3d3231d9fb9da528205f3b905097a37ac3df3"
"reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8cc3d3231d9fb9da528205f3b905097a37ac3df3",
"reference": "8cc3d3231d9fb9da528205f3b905097a37ac3df3",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c75d3ba185d5db6998124fa1a99a63e5d529b247",
"reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247",
"shasum": ""
},
"require": {
@@ -401,7 +401,7 @@
"s3",
"sdk"
],
"time": "2016-07-07 23:09:15"
"time": "2016-07-13 20:34:06"
},
{
"name": "backup-manager/backup-manager",