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
..
seeds	Merge branch 'master' of github.com:diaspora/diaspora into production	2010-09-15 22:37:05 -07:00
schema.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
seeds.rb	Spell our own name right	2010-09-15 17:56:18 -07:00