maxwell 15bd24a64f Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: spec/lib/message_handler_spec.rb spec/spec_helper.rb		2010-10-29 16:23:33 -07:00
..
attack_vectors_spec.rb	Moving to make_user, a few specs broken	2010-10-29 15:53:21 -07:00
invite_spec.rb	Moving to make_user, a few specs broken	2010-10-29 15:53:21 -07:00
posting_spec.rb	Moving to make_user, a few specs broken	2010-10-29 15:53:21 -07:00
querying_spec.rb	Moving to make_user, a few specs broken	2010-10-29 15:53:21 -07:00
receive_spec.rb	Moving to make_user, a few specs broken	2010-10-29 15:53:21 -07:00
user_friending_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora	2010-10-29 16:23:33 -07:00