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

diff --git a/server/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php b/server/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php
deleted file mode 100644
index 915b215..0000000
--- a/server/vendor/guzzlehttp/psr7/tests/DroppingStreamTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-namespace GuzzleHttp\Tests\Psr7;
-
-use GuzzleHttp\Psr7\BufferStream;
-use GuzzleHttp\Psr7\DroppingStream;
-
-class DroppingStreamTest extends \PHPUnit_Framework_TestCase
-{
-    public function testBeginsDroppingWhenSizeExceeded()
-    {
-        $stream = new BufferStream();
-        $drop = new DroppingStream($stream, 5);
-        $this->assertEquals(3, $drop->write('hel'));
-        $this->assertEquals(2, $drop->write('lo'));
-        $this->assertEquals(5, $drop->getSize());
-        $this->assertEquals('hello', $drop->read(5));
-        $this->assertEquals(0, $drop->getSize());
-        $drop->write('12345678910');
-        $this->assertEquals(5, $stream->getSize());
-        $this->assertEquals(5, $drop->getSize());
-        $this->assertEquals('12345', (string) $drop);
-        $this->assertEquals(0, $drop->getSize());
-        $drop->write('hello');
-        $this->assertSame(0, $drop->write('test'));
-    }
-}