wvengen 98e7189d31 Merge branch 'master' into i18n ... Conflicts: app/assets/javascripts/application.js		2013-10-18 12:30:34 +02:00
..
_form.html.haml	clean up price tooltips javascript	2013-10-09 10:43:41 +02:00
_stock_article_for_adding.html.haml
_stock_article_form.html.haml
_stock_change.html.haml
_stock_change_fields.html.haml
add_stock_change.js.erb
copy_stock_article.js.erb
create_stock_article.js.erb	clean up price tooltips javascript	2013-10-09 10:43:41 +02:00
derive_stock_article.js.erb
edit.html.haml
edit_stock_article.js.erb
index.html.haml
new.html.haml
new_stock_article.js.erb
show.html.haml
update_stock_article.js.erb