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

diff --git a/server/vendor/php-opencloud/common/src/Common/Api/AbstractApi.php b/server/vendor/php-opencloud/common/src/Common/Api/AbstractApi.php
deleted file mode 100644
index beee5e8..0000000
--- a/server/vendor/php-opencloud/common/src/Common/Api/AbstractApi.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace OpenCloud\Common\Api;
-
-abstract class AbstractApi implements ApiInterface
-{
-    protected $params;
-
-    protected function isRequired(array $param)
-    {
-        return array_merge($param, ['required' => true]);
-    }
-
-    protected function notRequired(array $param)
-    {
-        return array_merge($param, ['required' => false]);
-    }
-
-    protected function query(array $param)
-    {
-        return array_merge($param, ['location' => AbstractParams::QUERY]);
-    }
-
-    protected function url(array $param)
-    {
-        return array_merge($param, ['location' => AbstractParams::URL]);
-    }
-
-    public function documented(array $param)
-    {
-        return array_merge($param, ['required' => true]);
-    }
-}