98f59a3de3
Conflicts: app/helpers/orders_helper.rb app/views/orders/_edit_amount.html.haml |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
app_config.yml.SAMPLE | ||
application.rb | ||
boot.rb | ||
database.yml.MySQL_SAMPLE | ||
database.yml.SQLite_SAMPLE | ||
deploy.rb.SAMPLE | ||
environment.rb | ||
i18n-js.yml | ||
navigation.rb | ||
routes.rb | ||
schedule.rb |