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
..
album.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
aspect.rb	Validate uniqueness of aspect name, 359	2010-10-19 12:23:24 -07:00
comment.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
fb_status.rb	killed the public tab. made a broadcast button in everyone tab	2010-10-08 14:06:49 -07:00
person.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
photo.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
post.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
profile.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
request.rb	requests are made on invite but perhaps they should be made on signup so that we have a person	2010-10-14 18:12:18 -07:00
retraction.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
status_message.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
user.rb	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00