ilya 992bd42b55 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: spec/models/aspect_spec.rb		2010-10-20 11:30:06 -07:00
..
attack_vectors_spec.rb	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
invite_spec.rb	invite sends friend request if already friends, and raises if already friends	2010-10-18 16:27:02 -07:00
posting_spec.rb	Add a spec, move another to posting	2010-10-08 14:37:22 -07:00
receive_spec.rb	Revert "Revert "Merge remote branch 'upstream/master'""	2010-10-20 09:51:55 -07:00
user_friending_spec.rb	Put reloads back in	2010-10-20 10:35:16 -07:00
visible_posts_spec.rb	MS IZ aspect add and delete for a person	2010-10-19 18:25:59 -07:00