diaspora/spec/models/user
Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'"
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
..
attack_vectors_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02: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 "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
user_friending_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
visible_posts_spec.rb almost all green 2010-10-12 11:17:29 -07:00