Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

2 files changed, 0 insertions, 52 deletions

diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/headers.php b/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/headers.php
deleted file mode 100644
index f428992..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/headers.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-return [
-    'method' => 'POST',
-    'path' => 'something',
-    'params' => [
-        'name' => [
-            'type' => 'string',
-            'location' => 'header',
-            'sentAs' => 'X-Foo-Name'
-        ],
-        'age'  => [
-            'type' => 'integer',
-            'location' => 'header'
-        ],
-        'metadata' => [
-            'type'     => 'object',
-            'location' => 'header',
-            'items'    => [
-                'prefix' => 'X-Meta-'
-            ]
-        ],
-        'other' => ['type' => 'string'] // should not be a header
-    ],
-];
diff --git a/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/jsonBody.php b/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/jsonBody.php
deleted file mode 100644
index 350affd..0000000
--- a/server/vendor/php-opencloud/common/tests/unit/Common/Api/fixtures/jsonBody.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-return [
-    'method' => 'POST',
-    'path' => 'something',
-    'params' => [
-        'name' => [
-            'type' => 'string',
-            'sentAs' => 'server_name',
-        ],
-        'other' => [
-            'type' => 'array',
-            'sentAs' => 'other_params',
-            'items' => [
-                'type' => 'string'
-            ]
-        ],
-        'etc' => [
-            'type' => 'object',
-            'sentAs' => 'etcetc',
-            'properties' => [
-                'dob' => ['type' => 'string'],
-                'age' => ['type' => 'integer', 'sentAs' => 'current_age'],
-            ]
-        ],
-    ],
-];