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/Exception/JsonDecodingException.php b/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/JsonDecodingException.php
deleted file mode 100644
index 2c22881..0000000
--- a/server/vendor/justinrainbow/json-schema/src/JsonSchema/Exception/JsonDecodingException.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\Exception;
-
-/**
- * Wrapper for the JsonDecodingException
- */
-class JsonDecodingException extends \RuntimeException
-{
-    public function __construct($code = JSON_ERROR_NONE, \Exception $previous = null)
-    {
-        switch ($code) {
-            case JSON_ERROR_DEPTH:
-                $message = 'The maximum stack depth has been exceeded';
-                break;
-            case JSON_ERROR_STATE_MISMATCH:
-                $message = 'Invalid or malformed JSON';
-                break;
-            case JSON_ERROR_CTRL_CHAR:
-                $message = 'Control character error, possibly incorrectly encoded';
-                break;
-            case JSON_ERROR_UTF8:
-                $message = 'Malformed UTF-8 characters, possibly incorrectly encoded';
-                break;
-            case JSON_ERROR_SYNTAX:
-                $message = 'JSON syntax is malformed';
-                break;
-            default:
-                $message = 'Syntax error';
-        }
-        parent::__construct($message, $code, $previous);
-    }
-}
\ No newline at end of file