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

diff --git a/server/vendor/php-opencloud/common/src/Common/Auth/IdentityService.php b/server/vendor/php-opencloud/common/src/Common/Auth/IdentityService.php
deleted file mode 100644
index 695e7b1..0000000
--- a/server/vendor/php-opencloud/common/src/Common/Auth/IdentityService.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace OpenCloud\Common\Auth;
-
-interface IdentityService
-{
-    /**
-     * Authenticates and retrieves back a token and catalog.
-     *
-     * @return array The FIRST key is {@see Token} instance, the SECOND key is a {@see Catalog} instance
-     */
-    public function authenticate(array $options);
-}