Conflicts: app/views/finance/financial_transactions/_transactions.html.haml app/views/home/ordergroup.html.haml app/views/login/_accept_invitation_form.html.haml |
||
|---|---|---|
| .. | ||
| _ordergroup.haml | ||
| _transactions.html.haml | ||
| _transactions_search.html.haml | ||
| index.html.haml | ||
| index.js.erb | ||
| index_collection.html.haml | ||
| index_collection.js.erb | ||
| new.html.haml | ||
| new_collection.html.haml | ||