Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 32 deletions

diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/UriRetrieverInterface.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/UriRetrieverInterface.php
deleted file mode 100755
index c324998..0000000
--- a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/UriRetrieverInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of the JsonSchema package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace JsonSchema\Uri\Retrievers;
-
-/**
- * Interface for URI retrievers
- * 
- * @author Sander Coolen <sander@jibber.nl> 
- */
-interface UriRetrieverInterface
-{
-    /**
-     * Retrieve a schema from the specified URI
-     * @param string $uri URI that resolves to a JSON schema
-     * @throws \JsonSchema\Exception\ResourceNotFoundException
-     * @return mixed string|null
-     */
-    public function retrieve($uri);
-    
-    /**
-     * Get media content type
-     * @return string
-     */
-    public function getContentType();
-}
\ No newline at end of file