Conflicts: Gemfile README_DEVEL app/controllers/articles_controller.rb app/controllers/orders_controller.rb app/controllers/tasks_controller.rb app/models/task.rb app/views/articles/_import_search_results.haml app/views/articles/index.haml app/views/messages/new.haml app/views/ordering/_order_head.haml app/views/ordering/my_order_result.haml app/views/orders/show.haml app/views/stockit/new.html.haml db/schema.rb |
||
|---|---|---|
| .. | ||
| finance | ||
| application_helper.rb | ||
| article_categories_helper.rb | ||
| articles_helper.rb | ||
| deliveries_helper.rb | ||
| foodcoop_helper.rb | ||
| group_orders_helper.rb | ||
| home_helper.rb | ||
| messages_helper.rb | ||
| order_comments_helper.rb | ||
| orders_helper.rb | ||
| pages_helper.rb | ||
| sessions_helper.rb | ||
| stock_takings_helper.rb | ||
| stockit_helper.rb | ||
| tasks_helper.rb | ||
| users_helper.rb | ||