Merge branch 'master' into stable

2016-07-23 14:35:11 +02:00 · 2016-07-23 14:35:11 +02:00 · 6a3181482d
commit 6a3181482d
parent 7110f8c315 d786dc235a
1 changed files with 1 additions and 1 deletions
--- a/lib/remote_storage/swift.rb
+++ b/lib/remote_storage/swift.rb
@ -447,7 +447,7 @@ module RemoteStorage
    end

    def swift_token
-      reload_swift_token if Time.now - settings.swift_token_loaded_at > 3600
+      reload_swift_token if Time.now - settings.swift_token_loaded_at > 1800

      settings.swift_token
    end