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

diff --git a/server/vendor/php-opencloud/common/src/Common/Auth/Token.php b/server/vendor/php-opencloud/common/src/Common/Auth/Token.php
deleted file mode 100644
index 200fcee..0000000
--- a/server/vendor/php-opencloud/common/src/Common/Auth/Token.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace OpenCloud\Common\Auth;
-
-interface Token
-{
-    public function getId();
-
-    /**
-     * Indicates whether the token has expired or not.
-     *
-     * @return bool TRUE if the token has expired, FALSE if it is still valid
-     */
-    public function hasExpired();
-}