diaspora

mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00

Files

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

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

Cleanup stray whitespace

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

Spell our own name right

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

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

app_config.yml

Spell our own name right

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

application.rb

Cleanup stray whitespace

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

boot.rb

Spell our own name right

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

deploy_config.yml

2010-09-15 18:10:13 -07:00

deploy.rb

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

environment.rb

Spell our own name right

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

routes.rb

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

selenium.yml

Spell our own name right

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

thin.yml

2010-09-15 18:10:13 -07:00