maxwell 341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell ... Conflicts: Gemfile Gemfile.lock spec/models/user/invite_spec.rb		2010-10-14 23:02:06 -07:00
..
attack_vectors_spec.rb	added another attack vector spec	2010-10-13 18:43:22 -07:00
invite_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora into maxwell	2010-10-14 23:02:06 -07:00
posting_spec.rb	Add a spec, move another to posting	2010-10-08 14:37:22 -07:00
receive_spec.rb	receiving spec is green	2010-10-11 19:20:00 -07:00
user_friending_spec.rb	Take out reloads so specs run on 1.9.2	2010-10-12 20:54:00 -07:00
visible_posts_spec.rb	almost all green	2010-10-12 11:17:29 -07:00