diaspora/spec/lib
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
..
diaspora Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
em-webfinger_spec.rb Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 16:23:33 -07:00
encryptor_spec.rb Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
hcard_spec.rb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
message_handler_spec.rb Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 16:23:33 -07:00
salmon_salmon_spec.rb Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
verify_spec.rb Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
web_hooks_spec.rb Take unused models out of webhooks spec 2010-10-20 17:43:13 -07:00
webfinger_profile_spec.rb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
websocket_spec.rb Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00