Raphael 9309be2d69 Merge branch 'import' ...

Conflicts:
	spec/models/user/invite_spec.rb

2010-10-19 16:06:48 -07:00

..

diaspora

Merge branch 'import'

2010-10-19 16:06:48 -07:00

mongo_mapper

DG MS; 404 show pages for objects that don't exist for given user

2010-10-11 11:32:20 -07:00

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

Add or later to license notice

2010-10-07 16:25:34 -07:00

collect_user_photos.rb

DG MS; export photos button in users#edit

2010-10-07 16:56:10 -07:00

diaspora.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

encryptable.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

encryptor.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00

hcard.rb

refactor hcard for faster testing

2010-10-08 13:06:21 -07:00

message_handler.rb

Add or later to license notice

2010-10-07 16:25:34 -07:00