2b511ee559
Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less |
||
---|---|---|
.. | ||
_edit_note.html.haml | ||
_edit_results_by_articles.html.haml | ||
_group_order_articles.html.haml | ||
_invoice.html.haml | ||
_order_article.html.haml | ||
_order_article_result.html.haml | ||
_orders.html.haml | ||
_summary.haml | ||
confirm.html.haml | ||
edit_note.js.haml | ||
index.html.haml | ||
index.js.haml | ||
new.html.haml | ||
new.js.haml | ||
update_note.js.haml | ||
update_summary.js.haml |