maxwell a35892428c Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo		2010-07-07 20:09:27 -07:00
..
application_helper_spec.rb	DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.	2010-07-07 16:53:52 -07:00
socket_helper_spec.rb	RS MS added url for for the socket controller	2010-07-07 18:59:32 -07:00