summaryrefslogtreecommitdiff
path: root/server/composer.json
diff options
context:
space:
mode:
authorroot <root@kabir-PC>2016-03-23 11:31:51 +0100
committerroot <root@kabir-PC>2016-03-23 11:31:51 +0100
commita26989103d70fb0dd3ff6834de107cae246778c3 (patch)
tree0f243c83b790ffb57f19261fc2a509131f6776ce /server/composer.json
parent1342db60283cb61a1c3810993575d35b9fb33ac0 (diff)
parent6e78d76f887d1149ea85bfb06db7ee7ad7435f5a (diff)
Merge branch 'develop' of https://github.com/manzerbredes/istic-openstack into develop
Diffstat (limited to 'server/composer.json')
-rw-r--r--server/composer.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/composer.json b/server/composer.json
index d5e2dbc..9d44d6e 100644
--- a/server/composer.json
+++ b/server/composer.json
@@ -1,5 +1,6 @@
{
"require": {
- "php-opencloud/openstack": "dev-master"
+ "php-opencloud/openstack": "dev-master",
+ "php-opencloud/common": "dev-master"
}
}