Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 27 deletions

diff --git a/server/vendor/guzzlehttp/promises/CHANGELOG.md b/server/vendor/guzzlehttp/promises/CHANGELOG.md
deleted file mode 100755
index 3871ac7..0000000
--- a/server/vendor/guzzlehttp/promises/CHANGELOG.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# CHANGELOG
-
-## 1.1.0 - 2016-03-07
-
-* Update EachPromise to prevent recurring on a iterator when advancing, as this
-  could trigger fatal generator errors.
-* Update Promise to allow recursive waiting without unwrapping exceptions.
-
-## 1.0.3 - 2015-10-15
-
-* Update EachPromise to immediately resolve when the underlying promise iterator
-  is empty. Previously, such a promise would throw an exception when its `wait`
-  function was called.
-
-## 1.0.2 - 2015-05-15
-
-* Conditionally require functions.php.
-
-## 1.0.1 - 2015-06-24
-
-* Updating EachPromise to call next on the underlying promise iterator as late
-  as possible to ensure that generators that generate new requests based on
-  callbacks are not iterated until after callbacks are invoked.
-
-## 1.0.0 - 2015-05-12
-
-* Initial release