Merge branch 'master' into stable

This commit is contained in:
Greg Karékinian 2016-07-23 14:35:11 +02:00
commit 6a3181482d

View File

@ -447,7 +447,7 @@ module RemoteStorage
end end
def swift_token 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 settings.swift_token
end end