Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 4 deletions

diff --git a/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php b/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
deleted file mode 100755
index b92071c..0000000
--- a/server/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class TransferException extends \RuntimeException implements GuzzleException {}