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 |
||
---|---|---|
.. | ||
_alert_success.haml | ||
_article_price_info.html.haml | ||
_articles_by_articles.html.haml | ||
_articles_by_groups.html.haml | ||
_base_errors.haml | ||
_comments.haml | ||
_group.html.haml | ||
_group_form_fields.html.haml | ||
_open_orders.html.haml | ||
_user_form_fields.html.haml | ||
_workgroup_members.haml |