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

diff --git a/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php b/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php
deleted file mode 100644
index 8cf841b..0000000
--- a/server/vendor/php-opencloud/common/src/Common/Resource/ResourceInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace OpenCloud\Common\Resource;
-
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * Represents an API resource.
- *
- * @package OpenCloud\Common\Resource
- */
-interface ResourceInterface
-{
-    /**
-     * All models which represent an API resource should be able to be populated
-     * from a {@see ResponseInterface} object.
-     *
-     * @param ResponseInterface $response
-     *
-     * @return self
-     */
-    public function populateFromResponse(ResponseInterface $response);
-
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function populateFromArray(array $data);
-}