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
..
controllers	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
fixtures	updated the hcard fixture, because the old one is not actually representive of what we are using	2010-10-16 11:16:33 -07:00
helpers	Some specs for the make_links function.	2010-10-17 22:25:56 +02:00
lib	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
models	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
factories.rb	Error message for duplicate username; refactor User validation specs.	2010-10-16 22:36:26 -07:00
misc_spec.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
spec_helper.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
user_encryption_spec.rb	almost all green	2010-10-12 11:17:29 -07:00