Merge branch 'master' into stable

2015-11-24 15:38:15 +01:00 · 2015-11-24 15:38:15 +01:00 · 1ce856919e
commit 1ce856919e
parent 64e6dc7992 1dde722d6f
1 changed files with 1 additions and 1 deletions
--- a/lib/remote_storage/swift.rb
+++ b/lib/remote_storage/swift.rb
@ -293,7 +293,7 @@ module RemoteStorage
    end

    def url_for_key(user, directory, key)
-      "#{container_url_for(user)}/#{escape(directory)}/#{escape(key)}"
+      File.join [container_url_for(user), escape(directory), escape(key)].compact
    end

    def url_for_directory(user, directory)