4 commits

Author	SHA1	Message	Date
maxwell	a35892428c	Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo	2010-07-07 20:09:27 -07:00
danielvincent	3d105e7c1e	DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.	2010-07-07 16:53:52 -07:00
maxwell	5350b40e3c	broken autotest for rafi	2010-07-07 15:27:22 -07:00
maxwell	1b2745e788	added socket renderer spec and slight refactor	2010-06-29 11:50:15 -07:00