Conflicts: app/controllers/articles_controller.rb app/views/articles/_form.html.haml app/views/articles/sync.html.haml app/views/finance/balancing/_edit_note.html.haml app/views/finance/group_order_articles/_form.html.haml app/views/finance/order_articles/_edit.html.haml app/views/finance/order_articles/_new.html.haml app/views/group_orders/show.html.haml app/views/invites/_modal_form.html.haml |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| app_config.yml.SAMPLE | ||
| application.rb | ||
| boot.rb | ||
| database.yml.SAMPLE | ||
| environment.rb | ||
| navigation.rb | ||
| preinitializer.rb | ||
| routes.rb | ||
| schedule.rb | ||