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
..
confirmations	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00
mailer	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
passwords	Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'.	2010-10-08 21:51:59 +00:00
sessions	Big clean up: delete trailing whitespace	2010-09-26 12:48:40 -04:00
shared	Show the signup link	2010-09-16 10:07:58 +08:00
unlocks	Trying to merge in the pivots changes that we want in master	2010-08-18 21:10:42 -07:00