Merge branch '2.3' into 2.4

2016-07-29 12:51:23 -04:00
parent faf91470aa 6c22c52e3a
commit 8348f48692
1 changed files with 5 additions and 5 deletions
--- a/composer.lock
+++ b/composer.lock
@@ -325,16 +325,16 @@
        },
        {
            "name": "aws/aws-sdk-php",
-            "version": "3.18.33",
+            "version": "3.18.35",
            "source": {
                "type": "git",
                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "d787cfc514f77f5bee6990a466bc6922c0cf1526"
+                "reference": "8133c4ce336c8cac97218546f896f491bb6ffd7e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d787cfc514f77f5bee6990a466bc6922c0cf1526",
-                "reference": "d787cfc514f77f5bee6990a466bc6922c0cf1526",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8133c4ce336c8cac97218546f896f491bb6ffd7e",
+                "reference": "8133c4ce336c8cac97218546f896f491bb6ffd7e",
                "shasum": ""
            },
            "require": {
@@ -401,7 +401,7 @@
                "s3",
                "sdk"
            ],
-            "time": "2016-07-26 18:19:04"
+            "time": "2016-07-29 01:07:59"
        },
        {
            "name": "backup-manager/backup-manager",