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
..
_new.haml	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
edit.html.haml	the users are now made with people	2010-10-08 15:40:42 -07:00
new.html.haml	DG MS; invite is now a lightbox on feed and manage pages	2010-10-11 14:16:24 -07:00