1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
|---|---|---|
| .. | ||
| _administration.html.haml | ||
| _contact.html.haml | ||
| _features.html.haml | ||
| _forms.html.haml | ||
| _links.html.haml | ||
| _registration.html.haml | ||
| more.html.haml | ||
| show.html.haml | ||
| terms.html.haml | ||