Samuel Clay
|
aeb04deed2
|
Merge branch 'master' into social
* master:
Upgrading socket.io from 0.8.7 to 0.9.4 to fix IE insta-reconnection issues clogging the logs.
Conflicts:
assets.yml
media/js/socket.io-client.0.8.7.js
media/js/socket.io-client.0.9.4.js
media/js/vendor/socket.io-client.0.8.7.js
|
2012-04-03 13:11:45 -07:00 |
|