maxwell e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import ... Conflicts: app/controllers/users_controller.rb		2010-10-13 23:09:48 -07:00
..
diaspora	Merge branch 'master' of github.com:diaspora/diaspora into import	2010-10-13 23:09:48 -07:00
mongo_mapper
salmon	going calling by webfinger only once	2010-10-12 12:21:57 -07:00
tasks	Finish fixing move_private_key	2010-10-11 17:22:53 -07:00
chrome_frame.rb
collect_user_photos.rb
diaspora.rb
encryptable.rb
encryptor.rb
hcard.rb
message_handler.rb