3 commits

Author	SHA1	Message	Date
maxwell	5e6d0c1153	Merge branch 'master' of github.com:diaspora/diaspora_rails into ... friend-refactor, also fixed more specs Conflicts: app/models/person.rb app/models/user.rb spec/factories.rb	2010-08-05 15:13:05 -07:00
maxwell	cc04d4e08d	MS DG; more tests pass after making person have many people	2010-08-05 13:25:31 -07:00
maxwell	db1811eb61	DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket	2010-07-08 14:14:03 -07:00

Renamed from spec/controllers/socket_controller_spec.rb (Browse further)