diff options
| author | EoleDev <EoleDev@outlook.fr> | 2016-02-17 16:53:58 +0100 |
|---|---|---|
| committer | EoleDev <EoleDev@outlook.fr> | 2016-02-17 16:53:58 +0100 |
| commit | 2b38742bce1691f653dee924c1f030d14053c49e (patch) | |
| tree | bf80308883fe0223146e6cda4d680fb876d43084 /server | |
| parent | a8b6e051b4a4346ec4b22e07207f8dc766833c9b (diff) | |
| parent | 47e7d7d5402b3096a7554193eec10ff4b8bb2c3b (diff) | |
Merge branch 'develop' into Eole
Diffstat (limited to 'server')
| -rw-r--r--[-rwxr-xr-x] | server/Test/genTokenOptionsTest.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/composer.phar | bin | 1514291 -> 1514291 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | server/core/App.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/core/CoreInterface.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/core/Identity.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/core/LibOverride/genTokenOptions.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/index.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/init.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | server/vendor/justinrainbow/json-schema/bin/validate-json | 0 | ||||
| m--------- | server/vendor/php-opencloud/openstack | 0 |
10 files changed, 0 insertions, 0 deletions
diff --git a/server/Test/genTokenOptionsTest.php b/server/Test/genTokenOptionsTest.php index f7d0ee4..f7d0ee4 100755..100644 --- a/server/Test/genTokenOptionsTest.php +++ b/server/Test/genTokenOptionsTest.php diff --git a/server/composer.phar b/server/composer.phar Binary files differindex 0281237..0281237 100755..100644 --- a/server/composer.phar +++ b/server/composer.phar diff --git a/server/core/App.php b/server/core/App.php index babb3d9..babb3d9 100755..100644 --- a/server/core/App.php +++ b/server/core/App.php diff --git a/server/core/CoreInterface.php b/server/core/CoreInterface.php index ed0d959..ed0d959 100755..100644 --- a/server/core/CoreInterface.php +++ b/server/core/CoreInterface.php diff --git a/server/core/Identity.php b/server/core/Identity.php index 00199ec..00199ec 100755..100644 --- a/server/core/Identity.php +++ b/server/core/Identity.php diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php index b71defa..b71defa 100755..100644 --- a/server/core/LibOverride/genTokenOptions.php +++ b/server/core/LibOverride/genTokenOptions.php diff --git a/server/index.php b/server/index.php index 166e82e..166e82e 100755..100644 --- a/server/index.php +++ b/server/index.php diff --git a/server/init.php b/server/init.php index cf08523..cf08523 100755..100644 --- a/server/init.php +++ b/server/init.php diff --git a/server/vendor/justinrainbow/json-schema/bin/validate-json b/server/vendor/justinrainbow/json-schema/bin/validate-json index e93d53a..e93d53a 100755..100644 --- a/server/vendor/justinrainbow/json-schema/bin/validate-json +++ b/server/vendor/justinrainbow/json-schema/bin/validate-json diff --git a/server/vendor/php-opencloud/openstack b/server/vendor/php-opencloud/openstack -Subproject 1419eb2e01164bb6b8b837df37724423907352d +Subproject 15aca73f423166c7ef8337ba08615c103c66e93 |