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

diff --git a/server/vendor/php-opencloud/common/src/Common/ArrayAccessTrait.php b/server/vendor/php-opencloud/common/src/Common/ArrayAccessTrait.php
deleted file mode 100644
index 72bcfce..0000000
--- a/server/vendor/php-opencloud/common/src/Common/ArrayAccessTrait.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace OpenCloud\Common;
-
-/**
- * Encapsulates common logic for classes which implement the SPL \ArrayAccess interface.
- *
- * @package OpenCloud\Common
- */
-trait ArrayAccessTrait
-{
-    /**
-     * The internal state that this object represents
-     *
-     * @var array
-     */
-    private $internalState = [];
-
-    /**
-     * Sets an internal key with a value.
-     *
-     * @param string $offset
-     * @param mixed  $value
-     */
-    public function offsetSet($offset, $value)
-    {
-        if (null === $offset) {
-            $this->internalState[] = $value;
-        } else {
-            $this->internalState[$offset] = $value;
-        }
-    }
-
-    /**
-     * Checks whether an internal key exists.
-     *
-     * @param string $offset
-     *
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->internalState[$offset]);
-    }
-
-    /**
-     * Unsets an internal key.
-     *
-     * @param string $offset
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->internalState[$offset]);
-    }
-
-    /**
-     * Retrieves an internal key.
-     *
-     * @param string $offset
-     *
-     * @return mixed|null
-     */
-    public function offsetGet($offset)
-    {
-        return $this->offsetExists($offset) ? $this->internalState[$offset] : null;
-    }
-}