Conflicts: app/views/home/ordergroup.html.haml app/views/login/new_password.html.haml app/views/shared/_auto_complete_users.rhtml app/views/shared/memberships/_current_members.rhtml app/views/shared/memberships/_non_members.rhtml |
||
|---|---|---|
| .. | ||
| _body.html.haml | ||
| _form.html.haml | ||
| _page_list_item.html.haml | ||
| _recent_changes.html.haml | ||
| _site_map.html.haml | ||
| _title_list.html.haml | ||
| all.html.haml | ||
| edit.html.haml | ||
| new.html.haml | ||
| show.html.haml | ||
| version.html.haml | ||