From 3790eedc2f48c725c586b8c7b924875fedbeb7b4 Mon Sep 17 00:00:00 2001
From: root <root@dino.fm>
Date: Sun, 21 Apr 2013 20:00:42 -0400
Subject: getting ready to push

---
 frontend/static/js/room.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontend/static/js/room.js')

diff --git a/frontend/static/js/room.js b/frontend/static/js/room.js
index 8cd44d8..2d77f6f 100644
--- a/frontend/static/js/room.js
+++ b/frontend/static/js/room.js
@@ -158,7 +158,7 @@ var Room =
 			type: 'POST',
 			url: API.URL.room.join,
 			data: {'room':Room.name,'session':Auth.session,'enqueue':videoKey},
-			timeout: 2000,
+			timeout: 60000,
 			}).success(Room.joinCallback).error(Room.joinErrorCallback)
 		},
 	joinErrorCallback: function (jqXHR, textStatus, errorThrown)
-- 
cgit v1.2.3-70-g09d2