9e58a6f2b1
Conflicts: app/views/finance/financial_transactions/_transactions.html.haml app/views/home/ordergroup.html.haml app/views/login/_accept_invitation_form.html.haml |
||
---|---|---|
.. | ||
_accept_invitation_form.html.haml | ||
accept_invitation.html.haml | ||
forgot_password.html.haml | ||
new_password.html.haml |