Merge commit '237b627' into develop

42 files changed, 0 insertions, 0 deletions

diff --git a/server/vendor/guzzlehttp/guzzle/.travis.yml b/server/vendor/guzzlehttp/guzzle/.travis.yml
index a4cd64c..a4cd64c 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/.travis.yml
+++ b/server/vendor/guzzlehttp/guzzle/.travis.yml
diff --git a/server/vendor/guzzlehttp/guzzle/CHANGELOG.md b/server/vendor/guzzlehttp/guzzle/CHANGELOG.md
index 5c35854..5c35854 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ b/server/vendor/guzzlehttp/guzzle/CHANGELOG.md
diff --git a/server/vendor/guzzlehttp/guzzle/LICENSE b/server/vendor/guzzlehttp/guzzle/LICENSE
index ea7f07c..ea7f07c 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/LICENSE
+++ b/server/vendor/guzzlehttp/guzzle/LICENSE
diff --git a/server/vendor/guzzlehttp/guzzle/README.md b/server/vendor/guzzlehttp/guzzle/README.md
index 06e9497..06e9497 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/README.md
+++ b/server/vendor/guzzlehttp/guzzle/README.md
diff --git a/server/vendor/guzzlehttp/guzzle/UPGRADING.md b/server/vendor/guzzlehttp/guzzle/UPGRADING.md
index 9e31ddc..9e31ddc 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/UPGRADING.md
+++ b/server/vendor/guzzlehttp/guzzle/UPGRADING.md
diff --git a/server/vendor/guzzlehttp/guzzle/composer.json b/server/vendor/guzzlehttp/guzzle/composer.json
index f543372..f543372 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/composer.json
+++ b/server/vendor/guzzlehttp/guzzle/composer.json
diff --git a/server/vendor/guzzlehttp/guzzle/src/Client.php b/server/vendor/guzzlehttp/guzzle/src/Client.php
index 9f7b0cf..9f7b0cf 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Client.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Client.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/server/vendor/guzzlehttp/guzzle/src/ClientInterface.php
index 5222dab..5222dab 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/ClientInterface.php
+++ b/server/vendor/guzzlehttp/guzzle/src/ClientInterface.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
index 0b932ae..0b932ae 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
index 2cf298a..2cf298a 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
index 9887c1d..9887c1d 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
index 9cd5f9e..9cd5f9e 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/server/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
index acd654d..acd654d 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
index fd78431..fd78431 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
index f95c09f..f95c09f 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
index d33b0cc..d33b0cc 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
index c82998e..c82998e 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/GuzzleException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
index 56b1831..56b1831 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
index a77c289..a77c289 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/SeekException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
index 7cdd340..7cdd340 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
index b60a967..b60a967 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
index b92071c..b92071c 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
index 1091899..1091899 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
index b0fc236..b0fc236 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactoryInterface.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
index 43577da..43577da 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
index 945d06e..945d06e 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php b/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
index 7754e91..7754e91 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
index 0658769..0658769 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php b/server/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
index f8b00be..f8b00be 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
index 9f9c05f..9f9c05f 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/HandlerStack.php b/server/vendor/guzzlehttp/guzzle/src/HandlerStack.php
index a72e38a..a72e38a 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/HandlerStack.php
+++ b/server/vendor/guzzlehttp/guzzle/src/HandlerStack.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/MessageFormatter.php b/server/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
index 6b090a9..6b090a9 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
+++ b/server/vendor/guzzlehttp/guzzle/src/MessageFormatter.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Middleware.php b/server/vendor/guzzlehttp/guzzle/src/Middleware.php
index 449ab4b..449ab4b 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Middleware.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Middleware.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/Pool.php b/server/vendor/guzzlehttp/guzzle/src/Pool.php
index 8f1be33..8f1be33 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/Pool.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Pool.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php b/server/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
index e6d176b..e6d176b 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
+++ b/server/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php b/server/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
index dbe8b87..dbe8b87 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
+++ b/server/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/RequestOptions.php b/server/vendor/guzzlehttp/guzzle/src/RequestOptions.php
index 3af2f36..3af2f36 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/RequestOptions.php
+++ b/server/vendor/guzzlehttp/guzzle/src/RequestOptions.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php b/server/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
index 4b95a14..4b95a14 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
+++ b/server/vendor/guzzlehttp/guzzle/src/RetryMiddleware.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/TransferStats.php b/server/vendor/guzzlehttp/guzzle/src/TransferStats.php
index 15f717e..15f717e 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/TransferStats.php
+++ b/server/vendor/guzzlehttp/guzzle/src/TransferStats.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/UriTemplate.php b/server/vendor/guzzlehttp/guzzle/src/UriTemplate.php
index 55dfeb5..55dfeb5 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/UriTemplate.php
+++ b/server/vendor/guzzlehttp/guzzle/src/UriTemplate.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/functions.php b/server/vendor/guzzlehttp/guzzle/src/functions.php
index 5ab82af..5ab82af 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/functions.php
+++ b/server/vendor/guzzlehttp/guzzle/src/functions.php
diff --git a/server/vendor/guzzlehttp/guzzle/src/functions_include.php b/server/vendor/guzzlehttp/guzzle/src/functions_include.php
index a93393a..a93393a 100644..100755
--- a/server/vendor/guzzlehttp/guzzle/src/functions_include.php
+++ b/server/vendor/guzzlehttp/guzzle/src/functions_include.php