Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-01-08 22:55:51 +00:00
commit 783a7c3adf
1 changed files with 4 additions and 0 deletions

View File

@ -54,4 +54,8 @@ SampleApp::Application.configure do
# it's nice to have even admin accounts (which all the default ones are) generate GA data for testing
config.ga_suppress_admin = false
config.websocket_gateway_connect_time_stale = 16
config.websocket_gateway_connect_time_expire = 26
end