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
..
user	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
album_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
aspect_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
comments_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
person_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
photo_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
post_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
profile_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
request_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 22:37:05 -07:00
retraction_spec.rb	Spell our own name right	2010-09-15 17:56:18 -07:00
status_message_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
user_spec.rb	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 22:37:05 -07:00