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

..

controllers

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00

helpers

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00

models

Merge branch 'master' of github.com:diaspora/diaspora into production

2010-09-15 22:37:05 -07:00

uploaders

Spell our own name right

2010-09-15 17:56:18 -07:00

views

Show the signup link

2010-09-16 10:07:58 +08:00