7af796c09c
Conflicts: app/controllers/admin/ordergroups_controller.rb app/controllers/finance/balancing_controller.rb app/controllers/suppliers_controller.rb app/views/articles/_article.html.haml app/views/finance/balancing/_summary.haml app/views/finance/balancing/new.html.haml app/views/group_orders/_form.html.haml app/views/home/_apple_bar.html.haml app/views/suppliers/index.haml |
||
|---|---|---|
| .. | ||
| _form.html.haml | ||
| _orders.html.haml | ||
| _switch_order.html.haml | ||
| archive.html.haml | ||
| archive.js.haml | ||
| edit.html.haml | ||
| index.html.haml | ||
| new.html.haml | ||
| order.html.haml | ||
| show.html.haml | ||