Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'" ...

This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb

2010-10-20 14:59:55 +02:00

..

diaspora

Revert "Merge remote branch 'upstream/master'"

2010-10-20 14:59:55 +02: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

Revert "Merge remote branch 'upstream/master'"

2010-10-20 14:59:55 +02:00

message_handler.rb

Add or later to license notice

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