b8128d356b
Conflicts: Changelog.md app/views/people/show.html.haml config/defaults.yml spec/helpers/layout_helper_spec.rb |
||
|---|---|---|
| .. | ||
| deploy | ||
| environments | ||
| initializers | ||
| locales | ||
| application.rb | ||
| boot.rb | ||
| cap_colors.rb | ||
| cucumber.yml | ||
| database.yml.example | ||
| defaults.yml | ||
| deploy.rb | ||
| deploy_config.yml.example | ||
| diaspora.yml.example | ||
| environment.rb | ||
| load_config.rb | ||
| locale_settings.yml | ||
| routes.rb | ||
| schedule.rb.example | ||
| selenium.yml | ||
| thin.yml | ||
| unicorn.rb | ||