Merge commit '237b627' into develop

31 files changed, 0 insertions, 0 deletions

diff --git a/server/vendor/guzzlehttp/promises/.gitignore b/server/vendor/guzzlehttp/promises/.gitignore
index 83ec41e..83ec41e 100644..100755
--- a/server/vendor/guzzlehttp/promises/.gitignore
+++ b/server/vendor/guzzlehttp/promises/.gitignore
diff --git a/server/vendor/guzzlehttp/promises/.travis.yml b/server/vendor/guzzlehttp/promises/.travis.yml
index 4f4d2b8..4f4d2b8 100644..100755
--- a/server/vendor/guzzlehttp/promises/.travis.yml
+++ b/server/vendor/guzzlehttp/promises/.travis.yml
diff --git a/server/vendor/guzzlehttp/promises/CHANGELOG.md b/server/vendor/guzzlehttp/promises/CHANGELOG.md
index 3871ac7..3871ac7 100644..100755
--- a/server/vendor/guzzlehttp/promises/CHANGELOG.md
+++ b/server/vendor/guzzlehttp/promises/CHANGELOG.md
diff --git a/server/vendor/guzzlehttp/promises/LICENSE b/server/vendor/guzzlehttp/promises/LICENSE
index 581d95f..581d95f 100644..100755
--- a/server/vendor/guzzlehttp/promises/LICENSE
+++ b/server/vendor/guzzlehttp/promises/LICENSE
diff --git a/server/vendor/guzzlehttp/promises/Makefile b/server/vendor/guzzlehttp/promises/Makefile
index 8d5b3ef..8d5b3ef 100644..100755
--- a/server/vendor/guzzlehttp/promises/Makefile
+++ b/server/vendor/guzzlehttp/promises/Makefile
diff --git a/server/vendor/guzzlehttp/promises/README.md b/server/vendor/guzzlehttp/promises/README.md
index c6780ab..c6780ab 100644..100755
--- a/server/vendor/guzzlehttp/promises/README.md
+++ b/server/vendor/guzzlehttp/promises/README.md
diff --git a/server/vendor/guzzlehttp/promises/composer.json b/server/vendor/guzzlehttp/promises/composer.json
index f13844b..f13844b 100644..100755
--- a/server/vendor/guzzlehttp/promises/composer.json
+++ b/server/vendor/guzzlehttp/promises/composer.json
diff --git a/server/vendor/guzzlehttp/promises/phpunit.xml.dist b/server/vendor/guzzlehttp/promises/phpunit.xml.dist
index 500cd53..500cd53 100644..100755
--- a/server/vendor/guzzlehttp/promises/phpunit.xml.dist
+++ b/server/vendor/guzzlehttp/promises/phpunit.xml.dist
diff --git a/server/vendor/guzzlehttp/promises/src/AggregateException.php b/server/vendor/guzzlehttp/promises/src/AggregateException.php
index 6a5690c..6a5690c 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/AggregateException.php
+++ b/server/vendor/guzzlehttp/promises/src/AggregateException.php
diff --git a/server/vendor/guzzlehttp/promises/src/CancellationException.php b/server/vendor/guzzlehttp/promises/src/CancellationException.php
index cb360b8..cb360b8 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/CancellationException.php
+++ b/server/vendor/guzzlehttp/promises/src/CancellationException.php
diff --git a/server/vendor/guzzlehttp/promises/src/EachPromise.php b/server/vendor/guzzlehttp/promises/src/EachPromise.php
index 0344686..0344686 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/EachPromise.php
+++ b/server/vendor/guzzlehttp/promises/src/EachPromise.php
diff --git a/server/vendor/guzzlehttp/promises/src/FulfilledPromise.php b/server/vendor/guzzlehttp/promises/src/FulfilledPromise.php
index 5596296..5596296 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/FulfilledPromise.php
+++ b/server/vendor/guzzlehttp/promises/src/FulfilledPromise.php
diff --git a/server/vendor/guzzlehttp/promises/src/Promise.php b/server/vendor/guzzlehttp/promises/src/Promise.php
index 86820b2..86820b2 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/Promise.php
+++ b/server/vendor/guzzlehttp/promises/src/Promise.php
diff --git a/server/vendor/guzzlehttp/promises/src/PromiseInterface.php b/server/vendor/guzzlehttp/promises/src/PromiseInterface.php
index 8f5f4b9..8f5f4b9 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/PromiseInterface.php
+++ b/server/vendor/guzzlehttp/promises/src/PromiseInterface.php
diff --git a/server/vendor/guzzlehttp/promises/src/PromisorInterface.php b/server/vendor/guzzlehttp/promises/src/PromisorInterface.php
index b07fe32..b07fe32 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/PromisorInterface.php
+++ b/server/vendor/guzzlehttp/promises/src/PromisorInterface.php
diff --git a/server/vendor/guzzlehttp/promises/src/RejectedPromise.php b/server/vendor/guzzlehttp/promises/src/RejectedPromise.php
index bd499e6..bd499e6 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/RejectedPromise.php
+++ b/server/vendor/guzzlehttp/promises/src/RejectedPromise.php
diff --git a/server/vendor/guzzlehttp/promises/src/RejectionException.php b/server/vendor/guzzlehttp/promises/src/RejectionException.php
index 07c1136..07c1136 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/RejectionException.php
+++ b/server/vendor/guzzlehttp/promises/src/RejectionException.php
diff --git a/server/vendor/guzzlehttp/promises/src/TaskQueue.php b/server/vendor/guzzlehttp/promises/src/TaskQueue.php
index 39fe5bb..39fe5bb 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/TaskQueue.php
+++ b/server/vendor/guzzlehttp/promises/src/TaskQueue.php
diff --git a/server/vendor/guzzlehttp/promises/src/functions.php b/server/vendor/guzzlehttp/promises/src/functions.php
index 2fe61b7..2fe61b7 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/functions.php
+++ b/server/vendor/guzzlehttp/promises/src/functions.php
diff --git a/server/vendor/guzzlehttp/promises/src/functions_include.php b/server/vendor/guzzlehttp/promises/src/functions_include.php
index 34cd171..34cd171 100644..100755
--- a/server/vendor/guzzlehttp/promises/src/functions_include.php
+++ b/server/vendor/guzzlehttp/promises/src/functions_include.php
diff --git a/server/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php b/server/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php
index eaa7703..eaa7703 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php
+++ b/server/vendor/guzzlehttp/promises/tests/AggregateExceptionTest.php
diff --git a/server/vendor/guzzlehttp/promises/tests/EachPromiseTest.php b/server/vendor/guzzlehttp/promises/tests/EachPromiseTest.php
index 08af2a0..08af2a0 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/EachPromiseTest.php
+++ b/server/vendor/guzzlehttp/promises/tests/EachPromiseTest.php
diff --git a/server/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php b/server/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php
index 554c150..554c150 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php
+++ b/server/vendor/guzzlehttp/promises/tests/FulfilledPromiseTest.php
diff --git a/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php b/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
index 6288aa8..6288aa8 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
+++ b/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
diff --git a/server/vendor/guzzlehttp/promises/tests/PromiseTest.php b/server/vendor/guzzlehttp/promises/tests/PromiseTest.php
index 599d8ae..599d8ae 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/PromiseTest.php
+++ b/server/vendor/guzzlehttp/promises/tests/PromiseTest.php
diff --git a/server/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php b/server/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php
index 60f926e..60f926e 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php
+++ b/server/vendor/guzzlehttp/promises/tests/RejectedPromiseTest.php
diff --git a/server/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php b/server/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php
index 36c6a88..36c6a88 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php
+++ b/server/vendor/guzzlehttp/promises/tests/RejectionExceptionTest.php
diff --git a/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php b/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
index 845b263..845b263 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
+++ b/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
diff --git a/server/vendor/guzzlehttp/promises/tests/Thennable.php b/server/vendor/guzzlehttp/promises/tests/Thennable.php
index 398954d..398954d 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/Thennable.php
+++ b/server/vendor/guzzlehttp/promises/tests/Thennable.php
diff --git a/server/vendor/guzzlehttp/promises/tests/bootstrap.php b/server/vendor/guzzlehttp/promises/tests/bootstrap.php
index a63d264..a63d264 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/bootstrap.php
+++ b/server/vendor/guzzlehttp/promises/tests/bootstrap.php
diff --git a/server/vendor/guzzlehttp/promises/tests/functionsTest.php b/server/vendor/guzzlehttp/promises/tests/functionsTest.php
index 8e6fcf4..8e6fcf4 100644..100755
--- a/server/vendor/guzzlehttp/promises/tests/functionsTest.php
+++ b/server/vendor/guzzlehttp/promises/tests/functionsTest.php