loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into Eole

Browse source
This commit is contained in:
EoleDev 2016-02-17 16:53:58 +01:00
commit 2b38742bce
20 changed files with 120 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

0
server/Test/genTokenOptionsTest.php Executable file → Normal file
View file

0
server/composer.phar Executable file → Normal file
View file

0
server/core/App.php Executable file → Normal file
View file

0
server/core/CoreInterface.php Executable file → Normal file
View file

0
server/core/Identity.php Executable file → Normal file
View file

0
server/core/LibOverride/genTokenOptions.php Executable file → Normal file
View file

0
server/index.php Executable file → Normal file
View file

0
server/init.php Executable file → Normal file
View file

0
server/vendor/justinrainbow/json-schema/bin/validate-json vendored Executable file → Normal file
View file

2
server/vendor/php-opencloud/openstack vendored

@ -1 +1 @@
Subproject commit 1419eb2e01164bb6b8b837df37724423907352d7
Subproject commit 15aca73f423166c7ef8337ba08615c103c66e931