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, 50 deletions

diff --git a/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php b/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
deleted file mode 100644
index 6288aa8..0000000
--- a/server/vendor/guzzlehttp/promises/tests/NotPromiseInstance.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise\Tests;
-
-use GuzzleHttp\Promise\Promise;
-use GuzzleHttp\Promise\PromiseInterface;
-
-class NotPromiseInstance extends Thennable implements PromiseInterface
-{
-    private $nextPromise = null;
-
-    public function __construct()
-    {
-        $this->nextPromise = new Promise();
-    }
-
-    public function then(callable $res = null, callable $rej = null)
-    {
-        return $this->nextPromise->then($res, $rej);
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then($onRejected);
-    }
-
-    public function resolve($value)
-    {
-        $this->nextPromise->resolve($value);
-    }
-
-    public function reject($reason)
-    {
-        $this->nextPromise->reject($reason);
-    }
-
-    public function wait($unwrap = true, $defaultResolution = null)
-    {
-
-    }
-
-    public function cancel()
-    {
-
-    }
-
-    public function getState()
-    {
-        return $this->nextPromise->getState();
-    }
-}