16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
|---|---|---|
| .. | ||
| _domain_blocks.html.haml | ||
| _login.html.haml | ||
| _registration.html.haml | ||
| more.html.haml | ||
| show.html.haml | ||
| terms.html.haml | ||