Ariel Zavala 34d784bbbc Merge branch 'master' of http://github.com/maelsoucaze/diaspora

2010-09-16 21:18:50 -04:00

..

environments

Cleanup stray whitespace

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

initializers

merge with diaspora and resolved a conflict

2010-09-16 20:42:45 -04:00

locales

Merge branch 'master' of http://github.com/maelsoucaze/diaspora

2010-09-16 21:18:50 -04:00

sprinkle

Unified require quotes

2010-09-17 07:44:47 +08:00

app_config.yml

Spell our own name right

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

application.rb

Unified require quotes

2010-09-17 07:44:47 +08:00

boot.rb

Spell our own name right

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

deploy_config.yml

Spell our own name right

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

deploy.rb

Retab the project

2010-09-16 13:16:10 +08:00

environment.rb

Adding Haml html escaping.

2010-09-17 07:44:23 +08:00

routes.rb

get_to_the_choppa is back

2010-09-15 22:54:51 -07:00

selenium.yml

Spell our own name right

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

thin.yml

Spell our own name right

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