danielgrippi 775e7b6b2b Merge branch 'master' into follow ... Conflicts: features/step_definitions/user_steps.rb		2011-05-17 11:33:35 -07:00
..
deploy
environments
initializers
locales
app_config.yml.example
application.rb
assets.yml
boot.rb
cucumber.yml
database.yml.example
deploy.rb
deploy_config.yml.example
environment.rb
locale_settings.yml
oauth_keys.yml.example
redis.yml
routes.rb
selenium.yml
server.sh
thin.yml