benni 620ec946f1 Merge branch 'master' into master-rails3-merging ... Conflicts: .gitignore .rbenv-version app/controllers/finance/balancing_controller.rb app/views/finance/balancing/_order_article_form.html.haml Fixed updating current price in finance balancing.		2012-12-11 10:32:59 +01:00
..
_edit.html.haml	Merge branch 'master' into master-rails3-merging	2012-12-11 10:32:59 +01:00
_new.html.haml	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
create.js.haml	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
destroy.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
edit.js.haml	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
new.js.haml	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
update.js.haml	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00