summaryrefslogtreecommitdiff
path: root/provider_base/files
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-04-26 12:30:46 +0200
committervarac <varacanero@zeromail.org>2013-04-26 12:30:46 +0200
commit334e4242a55f36c8ba3bbaa8b5e1c44664402450 (patch)
tree80c0b8734b434c654eab7c86c89d009f11535c87 /provider_base/files
parent1c61472a0c0c14351993574f2673a6a3a3c75371 (diff)
parent27cb083212a74c94ed069ce9ef3dfc7593e85524 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'provider_base/files')
-rw-r--r--provider_base/files/service-definitions/v1/eip-service.json.erb (renamed from provider_base/files/service-definitions/eip-service.json.erb)0
1 files changed, 0 insertions, 0 deletions
diff --git a/provider_base/files/service-definitions/eip-service.json.erb b/provider_base/files/service-definitions/v1/eip-service.json.erb
index ca42bef5..ca42bef5 100644
--- a/provider_base/files/service-definitions/eip-service.json.erb
+++ b/provider_base/files/service-definitions/v1/eip-service.json.erb