Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots

This commit is contained in:
Raphael 2010-08-17 18:52:35 -07:00
commit 1c91faa2c5

View file

@ -1,5 +1,4 @@
- if user_signed_in?
- unless request.user_agent.include? "Safari" ||"Chrome"
= javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
:javascript
WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";