Conflicts: app/views/finance/financial_transactions/_transactions.html.haml app/views/home/ordergroup.html.haml app/views/login/_accept_invitation_form.html.haml |
||
|---|---|---|
| .. | ||
| balancing | ||
| financial_transactions | ||
| invoices | ||
| ordergroups | ||
| index.html.haml | ||
Conflicts: app/views/finance/financial_transactions/_transactions.html.haml app/views/home/ordergroup.html.haml app/views/login/_accept_invitation_form.html.haml |
||
|---|---|---|
| .. | ||
| balancing | ||
| financial_transactions | ||
| invoices | ||
| ordergroups | ||
| index.html.haml | ||