Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 18 deletions

diff --git a/server/vendor/composer/autoload_psr4.php b/server/vendor/composer/autoload_psr4.php
deleted file mode 100755
index 0b3ff02..0000000
--- a/server/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
-    'OpenStack\\' => array($vendorDir . '/php-opencloud/openstack/src'),
-    'OpenCloud\\Test\\' => array($vendorDir . '/php-opencloud/common/tests/unit'),
-    'OpenCloud\\Integration\\' => array($vendorDir . '/php-opencloud/common/tests/integration'),
-    'OpenCloud\\' => array($vendorDir . '/php-opencloud/common/src'),
-    'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'),
-    'GuzzleHttp\\Psr7\\' => array($vendorDir . '/guzzlehttp/psr7/src'),
-    'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
-    'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
-);