Raphael c031416ca8 Merge branch 'master' into HEAD ... Conflicts: lib/diaspora/user/receiving.rb pkg/ubuntu/dist		2010-11-02 10:54:37 -07:00
..
attack_vectors_spec.rb	IZ MS retractions now use diaspora handle	2010-11-01 17:11:06 -07:00
invite_spec.rb	removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)	2010-10-31 12:34:26 -07:00
posting_spec.rb	removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)	2010-10-31 12:34:26 -07:00
querying_spec.rb	removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)	2010-10-31 12:34:26 -07:00
receive_spec.rb	Merge branch 'master' into HEAD	2010-11-02 10:54:37 -07:00
user_friending_spec.rb	requests are almost there	2010-11-01 14:54:40 -07:00