Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 16 deletions

diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/DateTime.php b/server/vendor/php-opencloud/common/tests/unit/Common/DateTime.php
deleted file mode 100755
index 512ba30..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Common/DateTime.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace OpenCloud\Test\Common;
-
-class DateTime extends \DateTime
-{
-    public static function factory($time)
-    {
-        return new static($time);
-    }
-
-    public function toIso8601()
-    {
-        return $this->format(self::ISO8601);
-    }
-}