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
..
_person.html.haml	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -07:00
index.html.haml	default user picture change. stream link on all aspects page fix. layout view is not fragmented.	2010-10-19 11:29:29 -07:00
show.html.haml	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00