98f59a3de3
Conflicts: app/helpers/orders_helper.rb app/views/orders/_edit_amount.html.haml |
||
---|---|---|
.. | ||
de.yml | ||
en.yml | ||
fr.yml | ||
nl.yml | ||
overrides.yml |
98f59a3de3
Conflicts: app/helpers/orders_helper.rb app/views/orders/_edit_amount.html.haml |
||
---|---|---|
.. | ||
de.yml | ||
en.yml | ||
fr.yml | ||
nl.yml | ||
overrides.yml |