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

diff --git a/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php b/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php
deleted file mode 100644
index f0fe848..0000000
--- a/server/vendor/php-opencloud/common/tests/integration/SampleManagerInterface.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace OpenCloud\integration;
-
-interface SampleManagerInterface
-{
-    public function write($path, array $replacements);
-
-    public function deletePaths();
-}