Raphael c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production ... Conflicts: config/deploy.rb config/environments/production.rb spec/models/request_spec.rb		2010-09-15 22:37:05 -07:00
..
album.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
aspect.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
comment.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
person.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
photo.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
post.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
profile.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
request.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
retraction.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
status_message.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
user.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 22:37:05 -07:00