Merge branch 'compute'

Conflicts:
	server/core/LibOverride/genTokenOptions.php

1 files changed, 0 insertions, 55 deletions

diff --git a/server/vendor/justinrainbow/json-schema/README.md b/server/vendor/justinrainbow/json-schema/README.md
deleted file mode 100755
index 3f9c58c..0000000
--- a/server/vendor/justinrainbow/json-schema/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# JSON Schema for PHP
-
-[![Build Status](https://travis-ci.org/justinrainbow/json-schema.svg?branch=master)](https://travis-ci.org/justinrainbow/json-schema)
-[![Latest Stable Version](https://poser.pugx.org/justinrainbow/json-schema/v/stable.png)](https://packagist.org/packages/justinrainbow/json-schema)
-[![Total Downloads](https://poser.pugx.org/justinrainbow/json-schema/downloads.png)](https://packagist.org/packages/justinrainbow/json-schema)
-
-A PHP Implementation for validating `JSON` Structures against a given `Schema`.
-
-See [json-schema](http://json-schema.org/) for more details.
-
-## Installation
-
-### Library
-
-    $ git clone https://github.com/justinrainbow/json-schema.git
-
-### Dependencies
-
-#### [`Composer`](https://github.com/composer/composer) (*will use the Composer ClassLoader*)
-
-    $ wget http://getcomposer.org/composer.phar
-    $ php composer.phar require justinrainbow/json-schema:~1.3
-
-## Usage
-
-```php
-<?php
-
-// Get the schema and data as objects
-$retriever = new JsonSchema\Uri\UriRetriever;
-$schema = $retriever->retrieve('file://' . realpath('schema.json'));
-$data = json_decode(file_get_contents('data.json'));
-
-// If you use $ref or if you are unsure, resolve those references here
-// This modifies the $schema object
-$refResolver = new JsonSchema\RefResolver($retriever);
-$refResolver->resolve($schema, 'file://' . __DIR__);
-
-// Validate
-$validator = new JsonSchema\Validator();
-$validator->check($data, $schema);
-
-if ($validator->isValid()) {
-    echo "The supplied JSON validates against the schema.\n";
-} else {
-    echo "JSON does not validate. Violations:\n";
-    foreach ($validator->getErrors() as $error) {
-        echo sprintf("[%s] %s\n", $error['property'], $error['message']);
-    }
-}
-```
-
-## Running the tests
-
-    $ vendor/bin/phpunit