Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 0 insertions, 40 deletions

diff --git a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Validator.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Validator.php
deleted file mode 100644
index 14dbb60..0000000
--- a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Validator.php
+++ /dev/null
@@ -1,40 +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;
-
-use JsonSchema\Constraints\SchemaConstraint;
-use JsonSchema\Constraints\Constraint;
-
-/**
- * A JsonSchema Constraint
- *
- * @author Robert Schönthal <seroscho@googlemail.com>
- * @author Bruno Prieto Reis <bruno.p.reis@gmail.com>
- * @see    README.md
- */
-class Validator extends Constraint
-{
-    const SCHEMA_MEDIA_TYPE = 'application/schema+json';
-
-    /**
-     * Validates the given data against the schema and returns an object containing the results
-     * Both the php object and the schema are supposed to be a result of a json_decode call.
-     * The validation works as defined by the schema proposal in http://json-schema.org
-     *
-     * {@inheritDoc}
-     */
-    public function check($value, $schema = null, $path = null, $i = null)
-    {
-        $validator = $this->getFactory()->createInstanceFor('schema');
-        $validator->check($value, $schema);
-
-        $this->addErrors(array_unique($validator->getErrors(), SORT_REGULAR));
-    }
-}