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
..
balancing_controller.rb	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
base_controller.rb	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
financial_transactions_controller.rb	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
group_order_articles_controller.rb	Simplifiying balancing view part 2. Lets call it finished.	2012-07-27 18:03:46 +02:00
invoices_controller.rb	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
order_articles_controller.rb	Merge branch 'master' into master-rails3-merging	2012-12-11 10:32:59 +01:00
ordergroups_controller.rb	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00