summaryrefslogtreecommitdiff
path: root/server/composer.json
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2016-03-15 16:17:39 +0100
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2016-03-15 16:17:39 +0100
commit26d10bc0fa4befbac54453228ae1ce89021bdec2 (patch)
tree029d7240ecf7416205e5f76cf9107a6b5bdf8ca3 /server/composer.json
parent8ad216dedf017f3d6de047a25d08db3b98e16361 (diff)
parent03ef74d0cfe675a6e18a91f039182ca1b248d8f5 (diff)
Merge branch 'develop' into loic
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"
}
}