Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 13 deletions

diff --git a/server/vendor/php-opencloud/common/tests/integration/Utils.php b/server/vendor/php-opencloud/common/tests/integration/Utils.php
deleted file mode 100755
index d24c1bb..0000000
--- a/server/vendor/php-opencloud/common/tests/integration/Utils.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace OpenCloud\Integration;
-
-use GuzzleHttp\Client;
-
-class Utils
-{
-    public static function toCamelCase($word, $separator = '_')
-    {
-        return str_replace($separator, '', ucwords($word, $separator));
-    }
-}