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
helpers	Beat Dan at bugfixing	2010-10-19 11:43:10 -07:00
models	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00