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
..
images	default user picture change. stream link on all aspects page fix. layout view is not fragmented.	2010-10-19 11:29:29 -07:00
javascripts	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
stylesheets	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
404.html	more informative 400 and 500 pages	2010-09-13 15:24:15 -07:00
422.html	Activerecord this time\!	2010-06-11 10:40:49 -07:00
500.html	more informative 400 and 500 pages	2010-09-13 15:24:15 -07:00
favicon.ico	added favicon from pubsite	2010-06-29 22:14:39 -07:00
robots.txt	Activerecord this time\!	2010-06-11 10:40:49 -07:00