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

diff --git a/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php b/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
deleted file mode 100644
index 845b263..0000000
--- a/server/vendor/guzzlehttp/promises/tests/TaskQueueTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-namespace GuzzleHttp\Promise\Test;
-
-use GuzzleHttp\Promise\TaskQueue;
-
-class TaskQueueTest extends \PHPUnit_Framework_TestCase
-{
-    public function testKnowsIfEmpty()
-    {
-        $tq = new TaskQueue(false);
-        $this->assertTrue($tq->isEmpty());
-    }
-
-    public function testKnowsIfFull()
-    {
-        $tq = new TaskQueue(false);
-        $tq->add(function () {});
-        $this->assertFalse($tq->isEmpty());
-    }
-
-    public function testExecutesTasksInOrder()
-    {
-        $tq = new TaskQueue(false);
-        $called = [];
-        $tq->add(function () use (&$called) { $called[] = 'a'; });
-        $tq->add(function () use (&$called) { $called[] = 'b'; });
-        $tq->add(function () use (&$called) { $called[] = 'c'; });
-        $tq->run();
-        $this->assertEquals(['a', 'b', 'c'], $called);
-    }
-}