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
..
.gitkeep	First step for upgrading to rails 3.	2011-05-11 01:32:21 +02:00
foodsoft.rake	Merge branch 'master' into master-rails3-merging	2012-12-11 10:32:59 +01:00
multicoops.rake	Added rake task to execute every rake task for every foodcoop.	2012-08-27 08:24:25 +02:00
rails.rake	Initial commit of foodsoft 2	2009-01-06 11:49:19 +01:00