maxwell d04093f456 Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo		2010-07-08 10:18:03 -07:00
..
controllers	socket is now a controller	2010-07-08 10:17:41 -07:00
helpers	Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo	2010-07-07 20:09:27 -07:00
lib	Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo	2010-07-08 10:18:03 -07:00
models	DG IZ; fixed person requesting (friend requests).	2010-07-07 18:10:47 -07:00
factories.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo	2010-07-07 20:09:27 -07:00
misc_spec.rb	Sorry rspec	2010-07-07 10:55:32 -07:00
spec_helper.rb	socket is now a controller	2010-07-08 10:17:41 -07:00