42d622d1b2
Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less app/views/orders/_articles.html.haml app/views/orders/show.html.haml |
||
---|---|---|
.. | ||
_articles.html.haml | ||
_edit_amount.html.haml | ||
_edit_amounts.html.haml | ||
_form.html.haml | ||
_orders.html.haml | ||
add_article.js.erb | ||
edit.html.haml | ||
index.html.haml | ||
index.js.erb | ||
new.html.haml | ||
receive.html.haml | ||
receive_on_order_article_create.js.erb | ||
receive_on_order_article_update.js.erb | ||
show.html.haml | ||
show.js.erb |