66ac3be81f
Conflicts: app/views/home/ordergroup.html.haml app/views/login/new_password.html.haml app/views/shared/_auto_complete_users.rhtml app/views/shared/memberships/_current_members.rhtml app/views/shared/memberships/_non_members.rhtml |
||
---|---|---|
.. | ||
admin | ||
finance | ||
foodcoop | ||
application_controller.rb | ||
article_categories_controller.rb | ||
articles_controller.rb | ||
deliveries_controller.rb | ||
feedback_controller.rb | ||
group_orders_controller.rb | ||
home_controller.rb | ||
invites_controller.rb | ||
login_controller.rb | ||
messages_controller.rb | ||
order_comments_controller.rb | ||
orders_controller.rb | ||
sessions_controller.rb | ||
stock_takings_controller.rb | ||
stockit_controller.rb | ||
suppliers_controller.rb | ||
tasks_controller.rb | ||
users_controller.rb |