529956ea5a
Conflicts: app/helpers/pages_helper.rb public/stylesheets/main.css public/stylesheets/print.css |
||
---|---|---|
.. | ||
_edit_group_order_article.html.haml | ||
_edit_note.html.haml | ||
_edit_order_article.html.haml | ||
_edit_results_by_articles.html.haml | ||
_group_order_articles.html.haml | ||
_invoice.html.haml | ||
_new_group_order_article.html.haml | ||
_new_order_article.html.haml | ||
_order_article.html.haml | ||
_order_article_form.html.haml | ||
_order_article_result.html.haml | ||
_summary.haml | ||
confirm.html.haml | ||
index.haml | ||
list.html.haml | ||
new.html.haml |